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

make foreign key browser work from within search panel. thanks, marc, for

Browse Source 
spotting this. :)
This commit is contained in:
Garvin Hicking
2004-09-15 08:54:33 +00:00
parent cb5af5eb2f
commit 20c5dd53f2
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-09-15 Garvin Hicking <me@supergarv.de>
* Fixed foreign key browser window to also work from within
Search-subpanel.
2004-09-14 Marc Delisle <lem9@users.sourceforge.net> 2004-09-14 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: stay on the form when passwords don't match * server_privileges.php: stay on the form when passwords don't match
(after the js alert) (after the js alert)
@@ -14,7 +18,7 @@ $Source$
2004-09-14 Michal Čihař <michal@cihar.com> 2004-09-14 Michal Čihař <michal@cihar.com>
* themes.php, libraries/common.lib.php, libraries/defines.lib.php, * themes.php, libraries/common.lib.php, libraries/defines.lib.php,
libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php, libraries/select_theme.lib.php, themes/darkblue_orange/info.inc.php,
themes/original/info.inc.php: Better theme version check (bug #1023029). themes/original/info.inc.php: Better theme version check (bug #1023029).
* libraries/auth/cookie.auth.lib.php: Remember database when using cookie * libraries/auth/cookie.auth.lib.php: Remember database when using cookie
login (bug #1027873). login (bug #1027873).

19
browse_foreigners.php
View File

@@ -43,12 +43,21 @@ PMA_setFontSizes();
<script type="text/javascript" language="javascript"> <script type="text/javascript" language="javascript">
self.focus(); self.focus();
function formupdate(field, key) { function formupdate(field, key) {
if (opener && opener.document && opener.document.insertForm && opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]']) { if (opener && opener.document && opener.document.insertForm) {
opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]'].value = key; if (opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]']) {
self.close(); // Edit/Insert form
} else { opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]'].value = key;
alert('<?php echo PMA_jsFormat($strWindowNotFound); ?>'); self.close();
return false;
} else if (opener.document.insertForm.elements['field_' + field + '[1]']) {
// Search form
opener.document.insertForm.elements['field_' + field + '[1]'].value = key;
self.close();
return false;
}
} }
alert('<?php echo PMA_jsFormat($strWindowNotFound); ?>');
} }
</script> </script>
</head> </head>