From 5eaa8f86e0bbe9cebbfe9e761197186a159d0d90 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 11 Nov 2015 07:44:41 +1100
Subject: [PATCH] Fix #11654 Use a slider for Internal relations in foreign key
 supported tables

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                                  |  1 +
 templates/table/relation/common_form.phtml | 45 +++++++++++++---------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 98d5a898b8..7a4f612948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
 - issue        Tracking does not make sense for information_schema
 - issue #11550 Regression in Find and replace
 + issue #11619 TokuDB Tables Show Size as "unknown"
++ issue #11654 Use a slider for Internal relations
 
 4.5.2.0 (not yet released)
 - issue #11589 Incorrect parameter in mysqli_fetch_fields()
diff --git a/templates/table/relation/common_form.phtml b/templates/table/relation/common_form.phtml
index e770c17343..df15c06265 100644
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@@ -63,26 +63,13 @@
             </table>
         </fieldset>
     <?php endif; ?>
-    <?php if ($cfgRelation['displaywork']): ?>
-        <?php $save_row = array_values($columns);?>
-        <?php $disp = PMA_getDisplayField($db, $table); ?>
-        <fieldset>
-            <label><?php echo __('Choose column to display:'); ?></label>
-            <select name="display_field">
-                <option value="">---</option>
-                <?php foreach ($save_row as $row): ?>
-                    <option value="<?php echo htmlspecialchars($row['Field']); ?>"
-                        <?php if (isset($disp) && $row['Field'] == $disp): ?>
-                            selected="selected"
-                        <?php endif; ?>>
-                        <?php echo htmlspecialchars($row['Field']); ?>
-                    </option>
-                <?php endforeach; ?>
-            </select>
-        </fieldset>
-    <?php endif; ?>
 
     <?php if ($cfgRelation['relwork']): ?>
+        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
+            <br/>
+            <?php echo PMA\libraries\Util::getDivForSliderEffect('ir_div', __('Internal relations')) ?>
+        <?php endif; ?>
+
         <?php $save_row = array_values($columns);
         $saved_row_cnt  = count($save_row);?>
         <fieldset>
@@ -112,6 +99,28 @@
                     <?php endfor; ?>
             </table>
         </fieldset>
+        <?php if (PMA\libraries\Util::isForeignKeySupported($tbl_storage_engine)): ?>
+            </div>
+        <?php endif; ?>
+    <?php endif; ?>
+
+    <?php if ($cfgRelation['displaywork']): ?>
+        <?php $save_row = array_values($columns);?>
+        <?php $disp = PMA_getDisplayField($db, $table); ?>
+        <fieldset>
+            <label><?php echo __('Choose column to display:'); ?></label>
+            <select name="display_field">
+                <option value="">---</option>
+                <?php foreach ($save_row as $row): ?>
+                    <option value="<?php echo htmlspecialchars($row['Field']); ?>"
+                        <?php if (isset($disp) && $row['Field'] == $disp): ?>
+                            selected="selected"
+                        <?php endif; ?>>
+                        <?php echo htmlspecialchars($row['Field']); ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </fieldset>
     <?php endif; ?>
 
     <fieldset class="tblFooters">