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

bug 1429074, go back to this page choice not sticky

Browse Source
This commit is contained in:
Marc Delisle
2006-02-12 14:19:42 +00:00
parent f4a53774a7
commit b8da992112
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2006-02-12 Marc Delisle <lem9@users.sourceforge.net> 2006-02-12 Marc Delisle <lem9@users.sourceforge.net>
* lang/english and hebrew: bug #1429769, typo * lang/english and hebrew: bug #1429769, typo
* tbl_change.php, tbl_replace.php: bug #1429074, "go back to this page"
choice should be sticky
2006-02-10 Marc Delisle <lem9@users.sourceforge.net> 2006-02-10 Marc Delisle <lem9@users.sourceforge.net>
* .htaccess added to main directory for bug #1411996; at least on * .htaccess added to main directory for bug #1411996; at least on

16
tbl_change.php
View File

@@ -924,14 +924,8 @@ if (isset($primary_key)) {
<?php <?php
echo "\n"; echo "\n";
// Defines whether "insert another new row" should be if (!isset($after_insert)) {
// selected or not (keep this choice sticky) $after_insert = 'back';
if (!empty($disp_message)) {
$selected_after_insert_new_insert = ' selected="selected"';
$selected_after_insert_back = '';
} else {
$selected_after_insert_back = ' selected="selected"';
$selected_after_insert_new_insert = '';
} }
?> ?>
</td> </td>
@@ -940,12 +934,12 @@ if (!empty($disp_message)) {
</td> </td>
<td valign="middle" nowrap="nowrap"> <td valign="middle" nowrap="nowrap">
<select name="after_insert"> <select name="after_insert">
<option value="back" <?php echo $selected_after_insert_back; ?>><?php echo $strAfterInsertBack; ?></option> <option value="back" <?php echo ($after_insert == 'back' ? 'selected="selected"' : ''); ?>><?php echo $strAfterInsertBack; ?></option>
<option value="new_insert" <?php echo $selected_after_insert_new_insert; ?>><?php echo $strAfterInsertNewInsert; ?></option> <option value="new_insert" <?php echo ($after_insert == 'new_insert' ? 'selected="selected"' : ''); ?>><?php echo $strAfterInsertNewInsert; ?></option>
<?php <?php
if (isset($primary_key)) { if (isset($primary_key)) {
?> ?>
<option value="same_insert"><?php echo $strAfterInsertSame; ?></option> <option value="same_insert" <?php echo ($after_insert == 'same_insert' ? 'selected="selected"' : ''); ?>><?php echo $strAfterInsertSame; ?></option>
<?php <?php
// If we have just numeric primary key, we can also edit next // If we have just numeric primary key, we can also edit next
if (preg_match('@^[\s]*`[^`]*` = [0-9]+@', $primary_key)) { if (preg_match('@^[\s]*`[^`]*` = [0-9]+@', $primary_key)) {

3
tbl_replace.php
View File

@@ -35,6 +35,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
. '&disp_direction=' . $disp_direction . '&disp_direction=' . $disp_direction
. '&repeat_cells=' . $repeat_cells . '&repeat_cells=' . $repeat_cells
. '&dontlimitchars=' . $dontlimitchars . '&dontlimitchars=' . $dontlimitchars
. '&after_insert=' . $after_insert
. (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query)); . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
} elseif (isset($after_insert) && $after_insert == 'same_insert') { } elseif (isset($after_insert) && $after_insert == 'same_insert') {
$goto = 'tbl_change.php?' $goto = 'tbl_change.php?'
@@ -45,6 +46,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
. '&disp_direction=' . $disp_direction . '&disp_direction=' . $disp_direction
. '&repeat_cells=' . $repeat_cells . '&repeat_cells=' . $repeat_cells
. '&dontlimitchars=' . $dontlimitchars . '&dontlimitchars=' . $dontlimitchars
. '&after_insert=' . $after_insert
. (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query)); . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
if (isset($primary_key)) { if (isset($primary_key)) {
foreach ($primary_key AS $pk) { foreach ($primary_key AS $pk) {
@@ -60,6 +62,7 @@ if (isset($after_insert) && $after_insert == 'new_insert') {
. '&disp_direction=' . $disp_direction . '&disp_direction=' . $disp_direction
. '&repeat_cells=' . $repeat_cells . '&repeat_cells=' . $repeat_cells
. '&dontlimitchars=' . $dontlimitchars . '&dontlimitchars=' . $dontlimitchars
. '&after_insert=' . $after_insert
. (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query)); . (empty($sql_query) ? '' : '&sql_query=' . urlencode($sql_query));
if (isset($primary_key)) { if (isset($primary_key)) {
foreach ($primary_key AS $pk) { foreach ($primary_key AS $pk) {