webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Success message for display column change. Update display column in the database only if it has changed from the original value.

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne
2014-11-03 21:03:09 -08:00
parent 15a806824f
commit f65871c100
2 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libraries/tbl_relation.lib.php
View File

@@ -802,17 +802,23 @@ function PMA_sendHtmlForTableDropdownList()
* @param string $table current table
* @param array $cfgRelation configuration relation
*
* @return void
* @return string
*/
function PMA_handleUpdateForDisplayField($disp, $display_field, $db, $table,
$cfgRelation
) {
$html_output = '';
$upd_query = PMA_getQueryForDisplayUpdate(
$disp, $display_field, $db, $table, $cfgRelation
);
if ($upd_query) {
PMA_queryAsControlUser($upd_query);
$html_output = PMA_Util::getMessage(
__('Display column was successfully updated.'),
null, 'success'
);
}
return $html_output;
}
/**
@@ -831,7 +837,13 @@ function PMA_getQueryForDisplayUpdate($disp, $display_field, $db, $table,
) {
$upd_query = false;
if ($disp) {
if ($display_field != '') {
if ($display_field == '') {
$upd_query = 'DELETE FROM '
. PMA_Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA_Util::backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'';
} elseif ($disp != $display_field) {
$upd_query = 'UPDATE '
. PMA_Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA_Util::backquote($cfgRelation['table_info'])
@@ -839,12 +851,6 @@ function PMA_getQueryForDisplayUpdate($disp, $display_field, $db, $table,
. PMA_Util::sqlAddSlashes($display_field) . '\''
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'';
} else {
$upd_query = 'DELETE FROM '
. PMA_Util::backquote($GLOBALS['cfgRelation']['db'])
. '.' . PMA_Util::backquote($cfgRelation['table_info'])
. ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''
. ' AND table_name = \'' . PMA_Util::sqlAddSlashes($table) . '\'';
}
} elseif ($display_field != '') {
$upd_query = 'INSERT INTO '
@@ -877,6 +883,8 @@ function PMA_handleUpdatesForInternalRelations($destination_db,
$multi_edit_columns_name, $destination_table, $destination_column, $cfgRelation,
$db, $table, $existrel
) {
$html_output = '';
$updated = false;
foreach ($destination_db as $master_field_md5 => $foreign_db) {
$upd_query = PMA_getQueryForInternalRelationUpdate(
$multi_edit_columns_name,
@@ -885,12 +893,16 @@ function PMA_handleUpdatesForInternalRelations($destination_db,
);
if ($upd_query) {
PMA_queryAsControlUser($upd_query);
$updated = true;
}
}
return PMA_Util::getMessage(
__('Internal relations were successfully updated.'),
null, 'success'
);
if ($updated) {
$html_output = PMA_Util::getMessage(
__('Internal relations were successfully updated.'),
null, 'success'
);
}
return $html_output;
}
/**

2
tbl_relation.php
View File

@@ -122,7 +122,7 @@ if (isset($destination_foreign_db)) {
// U p d a t e s f o r d i s p l a y f i e l d
if ($cfgRelation['displaywork'] && isset($display_field)) {
PMA_handleUpdateForDisplayField(
$html_output .= PMA_handleUpdateForDisplayField(
$disp, $display_field, $db, $table, $cfgRelation
);
} // end if