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

Fix #11654 Use a slider for Internal relations in foreign key supported tables

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-11-11 07:44:41 +11:00
parent ee3090b96f
commit 5eaa8f86e0
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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()

45
templates/table/relation/common_form.phtml
View File

@ -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">