[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_5_0ALPHA1-9-gdcc9b2c

[Marc Delisle]

The branch, master has been updated
       via  dcc9b2c71f0141a08a64584e2549fd12d5c60285 (commit)
      from  4a48e5d82541e4e5420d71da9605c2923d2fe3c7 (commit)


- Log -----------------------------------------------------------------
commit dcc9b2c71f0141a08a64584e2549fd12d5c60285
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun Jan 8 07:26:06 2012 -0500

    bug #3411038 Zoom search and inserting foreign values

-----------------------------------------------------------------------

Summary of changes:
 browse_foreigners.php        |    6 +++++-
 libraries/tbl_select.lib.php |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/browse_foreigners.php b/browse_foreigners.php
index dd9979b..3eff09f 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -95,9 +95,13 @@ require_once './libraries/header_scripts.inc.php';
         var $inline = window.opener.jQuery('.browse_foreign_clicked');
         if ($inline.length != 0) {
             $inline.removeClass('browse_foreign_clicked')
+                // for grid editing,
                 // puts new value in the previous element which is
                 // a span with class curr_value
-                .prev().text(key);
+                .prev('.curr_value').text(key);
+            // for zoom-search editing, puts new value in the previous
+            // element which is an input field
+            $inline.prev('input[type=text]').val(key);
             self.close();
             return false;
         }
diff --git a/libraries/tbl_select.lib.php b/libraries/tbl_select.lib.php
index 86601d1..f660ba6 100644
--- a/libraries/tbl_select.lib.php
+++ b/libraries/tbl_select.lib.php
@@ -167,7 +167,11 @@ function PMA_getForeignFields_Values($foreigners, $foreignData, $field, $tbl_fie
     $str .=  <<<EOT
 <a target="_blank" onclick="window.open(this.href, 'foreigners', 'width=640,height=240,scrollbars=yes'); return false" href="browse_foreigners.php?
 EOT;
-        $str .= '' . PMA_generate_common_url($db, $table) .  '&field=' . urlencode($field) . '&fieldkey=' . $i . '">' . str_replace("'", "\'", $titles['Browse']) . '</a>';
+    $str .= '' . PMA_generate_common_url($db, $table) .  '&field=' . urlencode($field) . '&fieldkey=' . $i . '"';
+    if ($in_edit) {
+        $str .= ' class="browse_foreign"';
+    }
+    $str .= '>' . str_replace("'", "\'", $titles['Browse']) . '</a>';
         // ]]
         $str .= '</script>';
 


hooks/post-receive
-- 
phpMyAdmin