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

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

Browse Source
This commit is contained in:
Weblate 2017-02-13 15:31:55 +01:00
commit 0738c2f7e5
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -70,6 +70,7 @@ phpMyAdmin - ChangeLog
- issue #12957 Fixed manipulation with GIS data having zero coordinates
- issue #12804 Fixed various designer javascript errors
- issue #12934 Fixed possible javascript error on server status page
- issue #12927 Fixed javascript error on 3NF normalization
4.6.6 (2017-01-23)
- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

10
js/normalization.js
View File

@ -303,7 +303,7 @@ function goTo2NFStep2(pd, primary_key)
"pd": JSON.stringify(pd),
"getNewTables2NF":1};
$.ajax({
type: "GET",
type: "POST",
url: "normalization.php",
data: datastring,
async:false,
@ -352,12 +352,12 @@ function goTo3NFStep2(pd, tablesTds)
"pd": JSON.stringify(pd),
"getNewTables3NF":1};
$.ajax({
type: "GET",
type: "POST",
url: "normalization.php",
data: datastring,
async:false,
success: function(data) {
data_parsed = JSON.parse(data.message);
data_parsed = data;
if (data.success === true) {
extra += data_parsed.html;
} else {
@ -393,7 +393,7 @@ function processDependencies(primary_key, isTransitive)
tablesTds[tblname].push(primary_key);
}
var form_id = $(this).attr('id');
$('#' + form_id + ' input[type=checkbox]:not(:checked)').removeAttr('checked');
$('#' + form_id + ' input[type=checkbox]:not(:checked)').prop('checked', false);
dependsOn = '';
$('#' + form_id + ' input[type=checkbox]:checked').each(function(){
dependsOn += $(this).val() + ', ';
@ -637,7 +637,7 @@ AJAX.registerOnload('normalization.js', function() {
'( ' + escapeHtml(primary_key.toString()) + ', <input type="text" name="repeatGroupColumn" placeholder="' + PMA_messages.strNewColumnPlaceholder + '" value="' + escapeHtml(newColName) + '">)' +
'</ol>';
$("#newCols").html(confirmStr);
$('.tblFooters').html('<input type="submit" value="' + PMA_messages.strCancel + '" onclick="$(\'#newCols\').html(\'\');$(\'#extra input[type=checkbox]\').removeAttr(\'checked\')"/>' +
$('.tblFooters').html('<input type="submit" value="' + PMA_messages.strCancel + '" onclick="$(\'#newCols\').html(\'\');$(\'#extra input[type=checkbox]\').prop(\'checked\', false)"/>' +
'<input type="submit" value="' + PMA_messages.strGo + '" onclick="moveRepeatingGroup(\'' + escapeJsString(escapeHtml(repeatingCols)) + '\')"/>');
}
});

2
libraries/normalization.lib.php
View File

@ -558,7 +558,7 @@ function PMA_getHtmlForNewTables3NF($dependencies, $tables, $db)
}
}
}
return array('html' => $html, 'newTables' => $newTables);
return array('html' => $html, 'newTables' => $newTables, 'success' => true);
}
/**