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

Fix set and remove displayed field process

Browse Source 
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2019-11-20 10:51:56 +01:00
parent 770f30aa86
commit c7e8d50dcb
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
js/designer/move.js
View File

@ -72,7 +72,6 @@ var Glob_Y;
var timeoutID;
var layer_menu_cur_click = 0;
var step = 10;
var old_class;
var from_array = [];
var downer;
var menu_moved = false;
@ -1301,17 +1300,34 @@ function Click_field (db, T, f, PK) {
}
if (ON_display_field) {
var fieldNameToSend = decodeURIComponent(f);
var newDisplayFieldClass = 'tab_field';
var oldTabField = document.getElementById('id_tr_' + T + '.' + display_field[T]);
// if is display field
if (display_field[T] === f) {
old_class = 'tab_field';
if (display_field[T] === f) {// The display field is already the one defined, user wants to remove it
newDisplayFieldClass = 'tab_field';
delete display_field[T];
if (oldTabField) {// Clear the style
// Set display field class on old item
oldTabField.className = 'tab_field';
}
fieldNameToSend = '';
} else {
old_class = 'tab_field_3';
if (display_field[T]) {
document.getElementById('id_tr_' + T + '.' + display_field[T]).className = 'tab_field';
newDisplayFieldClass = 'tab_field_3';
if (display_field[T]) { // Had a previous one, clear it
if (oldTabField) {
// Set display field class on old item
oldTabField.className = 'tab_field';
}
delete display_field[T];
}
display_field[T] = f;
var tabField = document.getElementById('id_tr_' + T + '.' + display_field[T]);
if (tabField) {
// Set new display field class
tabField.className = newDisplayFieldClass;
}
}
ON_display_field = 0;
document.getElementById('designer_hint').innerHTML = '';
@ -1320,7 +1336,7 @@ function Click_field (db, T, f, PK) {
var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
$.post('db_designer.php',
{ operation: 'setDisplayField', ajax_request: true, server: server, db: db, table: T, field: f },
{ operation: 'setDisplayField', ajax_request: true, server: server, db: db, table: T, field: fieldNameToSend },
function (data) {
if (data.success === false) {
PMA_ajaxShowMessage(data.error, false);