From d5371be45575a38af9381df4a82d66636460b17e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Fri, 29 May 2015 10:49:11 +0530 Subject: [PATCH] bug #4920 relation view doesn't list fields of table in other database Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/tbl_relation.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 180852da65..fb9ad94410 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.4.9.0 (not yet released) +- bug #4920 relation view doesn't list fields of table in other database 4.4.8.0 (2015-05-28) - bug Allow accessing visual query builder when pmadb is not configured diff --git a/js/tbl_relation.js b/js/tbl_relation.js index fd35443d40..f3de08295c 100644 --- a/js/tbl_relation.js +++ b/js/tbl_relation.js @@ -39,10 +39,12 @@ function getDropdownValues($dropdown) { var foreign = ''; // if the changed dropdown is for foreign key constraints if ($dropdown.is('select[name^="destination_foreign"]')) { + $databaseDd = $dropdown.parent().parent().parent().find('select[name^="destination_foreign_db"]'); $tableDd = $dropdown.parent().parent().parent().find('select[name^="destination_foreign_table"]'); $columnDd = $dropdown.parent().parent().parent().find('select[name^="destination_foreign_column"]'); foreign = '_foreign'; } else { // internal relations + $databaseDd = $dropdown.parent().find('select[name^="destination_db"]'); $tableDd = $dropdown.parent().find('select[name^="destination_table"]'); $columnDd = $dropdown.parent().find('select[name^="destination_column"]'); } @@ -57,8 +59,7 @@ function getDropdownValues($dropdown) { return; } } else { // if a table selector - foreignDb = $dropdown.parent().parent().parent() - .find('select[name^="destination' + foreign + '_db"]').val(); + foreignDb = $databaseDd.val(); foreignTable = $dropdown.val(); // if no table is selected empty the column dropdown if (foreignTable === '') {