Display modify hint as title

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index a6c74bb3e7ac1dde45179e83181884be16deee68..847c1726777eb094b5742b3b610bb2a0989a2901 100644 (file)
--- 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);
-                               }
-                               $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;
+                       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;
                                }
-                               $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)) {
                                ?>
 <fieldset><legend><?php echo lang('Edit'); ?></legend><div>
-<input type="submit" value="<?php echo lang('Save'); ?>"<?php if (!$_GET["modify"] && !$_POST["val"]) { ?> onclick="if (!selectDblClicked) { alert('<?php echo lang('Double click on a value to modify it.'); ?>'); return false; };"<?php } ?>>
+<input type="submit" value="<?php echo lang('Save'); ?>" title="<?php echo lang('Double click on a value to modify it.'); ?>">
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
 <input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');">

diff --git a/adminer/static/functions.js b/adminer/static/functions.js
index 497b6c52d2f37cf8e3f7b376862583664f11ca63..0da2f7050dd33b5fa6751622b28e38082be5b00b 100644 (file)
--- 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');