From 5050de574fa3a0c4fccd39050d88d531c8d88ef3 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Fri, 7 May 2010 17:20:06 +0200 Subject: [PATCH] Display modify hint as title --- adminer/select.inc.php | 32 ++++++++++++++++++-------------- adminer/static/functions.js | 3 --- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/adminer/select.inc.php b/adminer/select.inc.php index a6c74bb3..847c1726 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -106,21 +106,25 @@ if ($_POST && !$error) { queries_redirect(remove_from_uri("page"), lang('%d item(s) have been affected.', $affected), $result); //! display edit page in case of an error } elseif (!$_POST["import"]) { // modify - $result = true; - $affected = 0; - foreach ($_POST["val"] as $unique_idf => $row) { - $set = array(); - foreach ($row as $key => $val) { - $key = bracket_escape($key, 1); // 1 - back - $set[] = idf_escape($key) . " = " . $adminer->processInput($fields[$key], $val); + if (!$_POST["val"]) { + $error = lang('Double click on a value to modify it.'); + } else { + $result = true; + $affected = 0; + foreach ($_POST["val"] as $unique_idf => $row) { + $set = array(); + foreach ($row as $key => $val) { + $key = bracket_escape($key, 1); // 1 - back + $set[] = idf_escape($key) . " = " . $adminer->processInput($fields[$key], $val); + } + $result = queries("UPDATE" . limit1(idf_escape($TABLE) . " SET " . implode(", ", $set) . " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : ""))); // can change row on a different page without unique key + if (!$result) { + break; + } + $affected += $connection->affected_rows; } - $result = queries("UPDATE" . limit1(idf_escape($TABLE) . " SET " . implode(", ", $set) . " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : ""))); // can change row on a different page without unique key - if (!$result) { - break; - } - $affected += $connection->affected_rows; + queries_redirect(remove_from_uri(), lang('%d item(s) have been affected.', $affected), $result); } - queries_redirect(remove_from_uri(), lang('%d item(s) have been affected.', $affected), $result); } elseif (is_string($file = get_file("csv_file", true))) { $file = preg_replace("~^\xEF\xBB\xBF~", '', $file); //! character set $result = true; @@ -361,7 +365,7 @@ if (!$columns) { if (!information_schema(DB)) { ?>
- onclick="if (!selectDblClicked) { alert(''); return false; };"> + diff --git a/adminer/static/functions.js b/adminer/static/functions.js index 497b6c52..0da2f705 100644 --- a/adminer/static/functions.js +++ b/adminer/static/functions.js @@ -123,15 +123,12 @@ function selectAddRow(field) { -var selectDblClicked = false; - /** Display edit field * @param HTMLElement * @param MouseEvent * @param boolean display textarea instead of input */ function selectDblClick(td, event, text) { - selectDblClicked = true; var pos = event.rangeOffset; var value = (td.firstChild.firstChild ? td.firstChild.firstChild.data : td.firstChild.data); var input = document.createElement(text ? 'textarea' : 'input');