Link help of partitioning types

diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index 88c0e05905452edd8d60e5a4d4f838224fba38e5..3fc2c0a86e37cde574c422f3407ae680b33f48b7 100644 (file)
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -1,6 +1,9 @@
 <?php
 $TABLE = $_GET["create"];
-$partition_by = array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST');
+$partition_by = array();
+foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
+       $partition_by[$key] = $key;
+}
 
 $referencable_primary = referencable_primary($TABLE);
 $foreign_keys = array();
@@ -71,7 +74,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
                }
                
                $partitioning = "";
-               if (in_array($row["partition_by"], $partition_by)) {
+               if ($partition_by[$row["partition_by"]]) {
                        $partitions = array();
                        if ($row["partition_by"] == 'RANGE' || $row["partition_by"] == 'LIST') {
                                foreach (array_filter($row["partition_names"]) as $key => $val) {
@@ -197,7 +200,7 @@ if (support("partitioning")) {
        print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
        ?>
 <p>
-<?php echo html_select("partition_by", array(-1 => "") + $partition_by, $row["partition_by"], "partitionByChange(this);") . doc_link("partitioning-types.html"); ?>
+<?php echo "<select name='partition_by' onchange='partitionByChange(this);'" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . ">" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>"; ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
 <?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
 <table cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>

diff --git a/adminer/static/editing.js b/adminer/static/editing.js
index 6ed4e7174e1245fc953bfa6db2f870af0d2456ad..00278bb01e80dd27599bfccaeeaab70cdfe749f5 100644 (file)
--- a/adminer/static/editing.js
+++ b/adminer/static/editing.js
@@ -443,6 +443,7 @@ function partitionByChange(el) {
        var partitionTable = /RANGE|LIST/.test(selectValue(el));
        alterClass(el.form['partitions'], 'hidden', partitionTable || !el.selectedIndex);
        alterClass(document.getElementById('partition-table'), 'hidden', !partitionTable);
+       helpClose();
 }
 
 /** Add next partition row

diff --git a/externals/jush b/externals/jush
index 7df46998eca7ae1fd56f6ec48d7bf08dea09127d..9493dcc08e23313562d6860d3fa0592e40ed2cf8 160000 (submodule)
--- a/externals/jush
+++ b/externals/jush
@@ -1 +1 @@
-Subproject commit 7df46998eca7ae1fd56f6ec48d7bf08dea09127d
+Subproject commit 9493dcc08e23313562d6860d3fa0592e40ed2cf8