Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

ChangeLog

@@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 - bug #4367 Import status infinite loop
 - bug #4902 Designer: Loading does not work
 - bug #4904 Setup: Overview > Display does not work
+- bug #4906 Designer: pages from all databases
 
 4.4.6.1 (2015-05-13)
 - bug #4899 [security] CSRF vulnerability in setup

js/pmd/designer_page.js

@@ -1,6 +1,6 @@
-function Show_tables_in_landing_page()
+function Show_tables_in_landing_page(db)
 {
-    Load_first_page(function (page) {
+    Load_first_page(db, function (page) {
         if (page) {
             Load_HTML_for_page(page.pg_nr);
             selected_page = page.pg_nr;
@@ -59,13 +59,16 @@ function Save_table_positions(positions, callback)
     DesignerOfflineDB.addObject('table_coords', positions, callback);
 }
 
-function Create_page_list(callback)
+function Create_page_list(db, callback)
 {
     DesignerOfflineDB.loadAllObjects('pdf_pages', function (pages) {
         var html = "";
         for (var p = 0; p < pages.length; p++) {
-            html += '<option value="' + pages[p].pg_nr + '">';
-            html += escapeHtml(pages[p].page_descr) + '</option>';
+            var page = pages[p];
+            if (page.db_name == db) {
+                html += '<option value="' + page.pg_nr + '">';
+                html += escapeHtml(page.page_descr) + '</option>';
+            }
         }
         if (typeof callback !== 'undefined') {
             callback(html);
@@ -85,9 +88,17 @@ function Delete_page(page_id, callback)
     });
 }
 
-function Load_first_page(callback)
+function Load_first_page(db, callback)
 {
-    DesignerOfflineDB.loadFirstObject('pdf_pages', callback);
+    DesignerOfflineDB.loadAllObjects('pdf_pages', function (pages) {
+        for (var i = 0; i < pages.length; i++) {
+            var page = pages[i];
+            if (page.db_name == db) {
+                callback(page);
+                return;
+            }
+        }
+    });
 }
 
 function Show_new_page_tables(check)

js/pmd/init.js

@@ -33,7 +33,7 @@ AJAX.registerOnload('pmd/init.js', function () {
     if (! pmd_tables_enabled) {
         DesignerOfflineDB.open(function(success) {
             if (success) {
-                Show_tables_in_landing_page();
+                Show_tables_in_landing_page(db);
             }
         });
     }

js/pmd/move.js

@@ -716,7 +716,7 @@ function Edit_pages()
                 PMA_ajaxRemoveMessage($msgbox);
 
                 if (! pmd_tables_enabled) {
-                    Create_page_list(function (options) {
+                    Create_page_list(db, function (options) {
                         $("#page_edit_dialog #selected_page").append(options);
                     });
                 }
@@ -796,7 +796,7 @@ function Delete_pages()
             PMA_ajaxRemoveMessage($msgbox);
 
             if (! pmd_tables_enabled) {
-                Create_page_list(function (options) {
+                Create_page_list(db, function (options) {
                     $("#page_delete_dialog #selected_page").append(options);
                 });
             }
@@ -895,7 +895,7 @@ function Save_as()
             PMA_ajaxRemoveMessage($msgbox);
 
             if (! pmd_tables_enabled) {
-                Create_page_list(function (options) {
+                Create_page_list(db, function (options) {
                     $("#page_save_as_dialog #selected_page").append(options);
                 });
             }
@@ -1010,7 +1010,7 @@ function Load_page(page) {
             .click();
     } else {
         if (page === null) {
-            Show_tables_in_landing_page();
+            Show_tables_in_landing_page(db);
         } else if (page > -1) {
             Load_HTML_for_page(page);
         } else if (page === -1) {