Merge branch 'QA_5_1'

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 23, 2021 · e0c1dea · e0c1dea
2 parents f6f4af1 + 70b38c6
commit e0c1dea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -90,6 +90,9 @@ phpMyAdmin - ChangeLog
 - issue        Fixed a JS error on dismiss notification modal
 - issue #16793 Upgrade CodeMirror to 5.61.0 to fix a JS error on scroll in SQL query box
 - issue        Fix password management for Percona Server lacking PASSWORD function
+- issue        Fixed "data is undefined" JS error
+- issue        Fixed 2 un-translated buttons on central columns edit
+- issue #16810 Fixed SQL query shown twice on central columns actions
 
 5.1.0 (2021-02-24)
 - issue #15350 Change Media (MIME) type references to Media type

diff --git a/js/src/navigation.js b/js/src/navigation.js
@@ -191,7 +191,7 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) {
             if (callback && typeof callback === 'function') {
                 callback(data);
             }
-        } else if (data.redirect_flag === '1') {
+        } else if (typeof data !== 'undefined' && data.redirect_flag === '1') {
             if (window.location.href.indexOf('?') === -1) {
                 window.location.href += '?session_expired=1';
             } else {

diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
@@ -262,10 +262,6 @@ public function addToCentralColumns(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 
@@ -297,10 +293,6 @@ public function removeFromCentralColumns(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 
@@ -337,10 +329,6 @@ public function fulltext(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 
@@ -377,10 +365,6 @@ public function spatial(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 
@@ -417,10 +401,6 @@ public function unique(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 
@@ -457,10 +437,6 @@ public function addIndex(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 
@@ -532,10 +508,6 @@ public function primary(): void
             $message = Message::success();
         }
 
-        $this->response->addHTML(
-            Generator::getMessage($message, $sql_query)
-        );
-
         $this->index();
     }
 

diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
@@ -268,10 +268,10 @@
                             </td>
                             <td class="del_row" data-rownum = "{{ row_num }}">
                                 <a hrf="#">{{ get_icon('b_drop', 'Delete' | trans) }}</a>
-                                <input type="submit" data-rownum = "{{ row_num }}" class="btn btn-secondary edit_cancel_form" value="Cancel">
+                                <input type="submit" data-rownum = "{{ row_num }}" class="btn btn-secondary edit_cancel_form" value="{{ 'Cancel'|trans }}">
                             </td>
                             <td id="{{ 'save_' ~ row_num  }}" class="hide">
-                                <input type="submit" data-rownum="{{ row_num }}" class="btn btn-primary edit_save_form" value="Save">
+                                <input type="submit" data-rownum="{{ row_num }}" class="btn btn-primary edit_save_form" value="{{ 'Save'|trans }}">
                             </td>
                             <td name="col_name" class="text-nowrap">
                                 <span>{{ row['col_name'] }}</span>