gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_9' into QA_5_0

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-08-23 12:34:01 +02:00
commit 1af61f88b3
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/designer/move.js
View File

@ -1971,7 +1971,7 @@ DesignerMove.enableTableEvents = function (index, element) {
DesignerMove.smallTab($(this).attr('table_name'), 1);
});
$(element).on('click', '.small_tab_pref_1', function () {
DesignerMove.startTabUpd($(this).attr('db'), $(this).attr('table_name_small'));
DesignerMove.startTabUpd($(this).attr('db_url'), $(this).attr('table_name_url'));
});
$(element).on('click', '.select_all_store_col', function () {
var params = ($(this).attr('store_column_param')).split(',');

1
libraries/classes/Database/Designer/Common.php
View File

@ -68,6 +68,7 @@ class Common
foreach ($tables as $one_table) {
$DF = $this->relation->getDisplayField($db, $one_table['TABLE_NAME']);
$DF = is_string($DF) ? $DF : '';
$DF = ($DF !== '') ? $DF : null;
$designerTables[] = new DesignerTable(
$db,