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

Fix broken trigger links after edit operation

Browse Source
This commit is contained in:
Rouslan Placella 2011-07-01 16:45:03 +01:00
parent d7c0da5f85
commit 58d97f87ee
2 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
js/db_routines.js
View File

@ -265,34 +265,41 @@ $(document).ready(function() {
if (mode == 'edit') {
$edit_row.remove();
}
// Insert the new row at the correct location in the list of routines
/**
* @var text Contains the name of a routine from the list
* that is used in comparisons to find the correct
* location where to insert a new row.
*/
var text = '';
/**
* @var inserted Whether a new has been inserted
* in the list of routines or not.
*/
var inserted = false;
$('table.data').find('tr').each(function() {
text = $(this).children('td').eq(0).find('strong').text().toUpperCase();
if (text != '' && text > data.name) {
$(this).before(data.new_row);
inserted = true;
return false;
if (editor != 'trigger' || data.sameTable == true) {
// Insert the new row at the correct location in the list of routines
/**
* @var text Contains the name of a routine from the list
* that is used in comparisons to find the correct
* location where to insert a new row.
*/
var text = '';
/**
* @var inserted Whether a new has been inserted
* in the list of routines or not.
*/
var inserted = false;
$('table.data').find('tr').each(function() {
text = $(this).children('td').eq(0).find('strong').text().toUpperCase();
if (text != '' && text > data.name) {
$(this).before(data.new_row);
inserted = true;
return false;
}
});
if (! inserted) {
$('table.data').append(data.new_row);
}
});
if (! inserted) {
$('table.data').append(data.new_row);
// Fade-in the new row
$('.ajaxInsert').show('slow').removeClass('ajaxInsert');
// Now we have inserted the row at the correct position, but surely
// at least some row classes are wrong now. So we will itirate
// throught all rows and assign correct classes to them.
} else if ($('table.data').find('tr').has('td').length == 0) {
$('table.data').hide("slow", function () {
$('#nothing2display').show("slow");
});
}
// Fade-in the new row
$('.ajaxInsert').show('slow').removeClass('ajaxInsert');
// Now we have inserted the row at the correct position, but surely
// at least some row classes are wrong now. So we will itirate
// throught all rows and assign correct classes to them.
/**
* @var ct Count of processed rows.
*/

15
libraries/rte/rte_triggers.lib.php
View File

@ -120,14 +120,15 @@ function PMA_TRI_handleEditor()
if ($GLOBALS['is_ajax_request']) {
$extra_data = array();
if ($message->isSuccess()) {
$triggers = PMA_DBI_get_triggers($db, $table);
foreach ($triggers as $key => $value) {
if ($value['name'] == $_REQUEST['item_name']) {
$trigger = $value;
}
$trigger = PMA_TRI_getDataFromName($_REQUEST['item_name']);
$extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['item_name']));
$extra_data['sameTable'] = false;
if (empty($table)) {
$extra_data['sameTable'] = true;
} else if ($table == $trigger['table']) {
$extra_data['sameTable'] = true;
}
$extra_data['name'] = htmlspecialchars(strtoupper($_REQUEST['item_name']));
$extra_data['new_row'] = PMA_RTE_getRowForList('trigger', $trigger, 0);
$extra_data['new_row'] = PMA_RTE_getRowForList('trigger', $trigger, 0);
$response = $output;
} else {
$response = $message;