Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -40,6 +40,7 @@ phpMyAdmin - ChangeLog
 + rfe #1235 Relation view: move to main "Structure" page
 + rfe #1558 Designer menu with explicit text
 + rfe #937  Relations with views like with tables
++ rfe #1241 Browse Field -> Search
 
 4.3.10.0 (not yet released)
 - bug       Undefined index navwork

js/makegrid.js

@@ -748,14 +748,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 // remember this instead of testing more than once
                 var is_null = $td.is('.null');
 
-                // add show data row link if the data resulted by 'browse distinct values' in table structure
-                if ($td.find('input').hasClass('data_browse_link')) {
-                    var showDataRowLink = document.createElement('div');
-                    showDataRowLink.className = 'goto_link';
-                    $(showDataRowLink).append("<a href='" + $td.find('.data_browse_link').val() + "'>" + g.showDataRowLinkText + "</a>");
-                    $editArea.append(showDataRowLink);
-                }
-
                 // add goto link, if this cell contains a link
                 if ($td.find('a').length > 0) {
                     var gotoLink = document.createElement('div');
@@ -1698,7 +1690,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.saveCellWarning = PMA_messages.strSaveCellWarning;
             g.alertNonUnique = PMA_messages.strAlertNonUnique;
             g.gotoLinkText = PMA_messages.strGoToLink;
-            g.showDataRowLinkText = PMA_messages.strShowDataRowLink;
 
             // initialize cell editing configuration
             g.saveCellsAtOnce = $(g.o).find('.save_cells_at_once').val();

js/messages.php

@@ -460,7 +460,6 @@ default:
 $js_messages['strGoToLink'] = __('Go to link:');
 $js_messages['strColNameCopyTitle'] = __('Copy column name.');
 $js_messages['strColNameCopyText'] = __('Right-click the column name to copy it to your clipboard.');
-$js_messages['strShowDataRowLink'] = __('Show data row(s).');
 
 /* password generation */
 $js_messages['strGeneratePassword'] = __('Generate password');

libraries/DisplayResults.class.php

@@ -4158,6 +4158,17 @@ class PMA_DisplayResults
         if (/*overload*/mb_strlen($this->__get('table'))) {
             // This method set the values for $map array
             $this->_setParamForLinkForeignKeyRelatedTables($map);
+
+            // Coming from 'Distinct values' action of structure page
+            // We manipulate relations mechanism to show a link to related rows.
+            if (! empty($_GET['browse_distinct'])) {
+                $map[$fields_meta[1]->name] = array(
+                    $this->__get('table'),
+                    $fields_meta[1]->name,
+                    '',
+                    $this->__get('db')
+                );
+            }
         } // end if
         // end 2b
 

libraries/structure.lib.php

@@ -2040,7 +2040,7 @@ function PMA_getHtmlForDistinctValueAction($url_query, $row, $titles)
             . ' GROUP BY ' . PMA_Util::backquote($row['Field'])
             . ' ORDER BY ' . PMA_Util::backquote($row['Field'])
         )
-        . '">'
+        . '&browse_distinct=1">'
         . $titles['DistinctValues']
         . '</a>';
     $html_output .= '</li>';