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

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

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)

View File

@@ -43,13 +43,22 @@ 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) {
if (opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]']) {
// Edit/Insert form
opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]'].value = key; opener.document.insertForm.elements['field_' + field + '<?php echo (isset($pk) ? '[multi_edit][' . urlencode($pk) . ']' : ''); ?>[]'].value = key;
self.close(); self.close();
} else { return false;
alert('<?php echo PMA_jsFormat($strWindowNotFound); ?>'); } 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>