Skip to content

Commit

Permalink
Don't hide/show added/dropped columns (bug 1920167)
Browse files Browse the repository at this point in the history 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@381 7c3ca157-0c34-0410-bff1-cbf682f78f5c
  • Loading branch information
jakubvrana committed Mar 20, 2008
1 parent fb3c74e commit f2813b5
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions editing.inc.php
View file
Expand Up @@ -64,7 +64,7 @@ function process_input($name, $field) {


function edit_type($key, $field, $collations) { function edit_type($key, $field, $collations) {
global $types, $unsigned, $inout; global $types, $unsigned, $inout;
?> ?>
<td><select name="<?php echo $key; ?>[type]" onchange="type_change(this);"><?php echo optionlist(array_keys($types), $field["type"]); ?></select></td> <td><select name="<?php echo $key; ?>[type]" onchange="type_change(this);"><?php echo optionlist(array_keys($types), $field["type"]); ?></select></td>
<td><input name="<?php echo $key; ?>[length]" value="<?php echo htmlspecialchars($field["length"]); ?>" size="3" /></td> <td><input name="<?php echo $key; ?>[length]" value="<?php echo htmlspecialchars($field["length"]); ?>" size="3" /></td>
<td><select name="<?php echo $key; ?>[collation]"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $field["collation"]); ?></select> <select name="<?php echo $key; ?>[unsigned]"><?php echo optionlist($unsigned, $field["unsigned"]); ?></select></td> <td><select name="<?php echo $key; ?>[collation]"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $field["collation"]); ?></select> <select name="<?php echo $key; ?>[unsigned]"><?php echo optionlist($unsigned, $field["unsigned"]); ?></select></td>
Expand All @@ -82,7 +82,7 @@ function process_type($field, $collate = "COLLATE") {


function edit_fields($fields, $collations, $type = "TABLE") { function edit_fields($fields, $collations, $type = "TABLE") {
global $inout; global $inout;
?> ?>
<thead><tr> <thead><tr>
<?php if ($type == "PROCEDURE") { ?><td><?php echo lang('IN-OUT'); ?></td><?php } ?> <?php if ($type == "PROCEDURE") { ?><td><?php echo lang('IN-OUT'); ?></td><?php } ?>
<th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?></th> <th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?></th>
Expand All @@ -100,10 +100,11 @@ function edit_fields($fields, $collations, $type = "TABLE") {
$column_comments = false; $column_comments = false;
foreach ($fields as $i => $field) { foreach ($fields as $i => $field) {
$i++; $i++;
$display = ($_POST["add"][$i-1] || (isset($field["field"]) && !$_POST["drop_col"][$i]));
?> ?>
<tr> <tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
<?php if ($type == "PROCEDURE") { ?><td><select name="fields[<?php echo $i; ?>][inout]"><?php echo optionlist($inout, $field["inout"]); ?></select></td><?php } ?> <?php if ($type == "PROCEDURE") { ?><td><select name="fields[<?php echo $i; ?>][inout]"><?php echo optionlist($inout, $field["inout"]); ?></select></td><?php } ?>
<th><input name="fields[<?php echo $i; ?>][field]" value="<?php echo ($_POST["drop_col"][$i] ? "" : htmlspecialchars($field["field"])); ?>" maxlength="64" /><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo htmlspecialchars($field[($_POST ? "orig" : "field")]); ?>" /></th> <th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo htmlspecialchars($field["field"]); ?>" maxlength="64" /><?php } ?><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo htmlspecialchars($field[($_POST ? "orig" : "field")]); ?>" /></th>
<?php edit_type("fields[$i]", $field, $collations); ?> <?php edit_type("fields[$i]", $field, $collations); ?>
<?php if ($type == "TABLE") { ?> <?php if ($type == "TABLE") { ?>
<td><input type="checkbox" name="fields[<?php echo $i; ?>][null]" value="1"<?php if ($field["null"]) { ?> checked="checked"<?php } ?> /></td> <td><input type="checkbox" name="fields[<?php echo $i; ?>][null]" value="1"<?php if ($field["null"]) { ?> checked="checked"<?php } ?> /></td>
Expand All @@ -121,7 +122,7 @@ function edit_fields($fields, $collations, $type = "TABLE") {
} }


function type_change($count) { function type_change($count) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">
var added = '.'; var added = '.';
function add_row(button) { function add_row(button) {
Expand Down Expand Up @@ -152,7 +153,8 @@ function add_row(button) {
return true; return true;
} }
function remove_row(button) { function remove_row(button) {
button.form[button.name.replace(/drop_col(.+)/, 'fields$1[field]')].value = ''; var field = button.form[button.name.replace(/drop_col(.+)/, 'fields$1[field]')];
field.parentNode.removeChild(field);
button.parentNode.parentNode.style.display = 'none'; button.parentNode.parentNode.style.display = 'none';
return true; return true;
} }
Expand Down

0 comments on commit f2813b5

Please sign in to comment.