[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11422-g49b2ca9

Rouslan Placella roccivic at users.sourceforge.net
Thu Jul 21 21:08:35 CEST 2011


The branch, master has been updated
       via  49b2ca984a6c38fa7b49aeff3f1344d837cf5834 (commit)
      from  4925260d959d8bd7194b912ddd1317c71f7cc42b (commit)


- Log -----------------------------------------------------------------
commit 49b2ca984a6c38fa7b49aeff3f1344d837cf5834
Author: Rouslan Placella <rouslan at placella.com>
Date:   Thu Jul 21 20:07:59 2011 +0100

    No need to show a "table" column in the list of triggers, if a table is already selected.

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

Summary of changes:
 libraries/rte/rte_list.lib.php |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/libraries/rte/rte_list.lib.php b/libraries/rte/rte_list.lib.php
index 91cbbbc..3b6177d 100644
--- a/libraries/rte/rte_list.lib.php
+++ b/libraries/rte/rte_list.lib.php
@@ -20,6 +20,8 @@ if (! defined('PHPMYADMIN')) {
  */
 function PMA_RTE_getList($type, $items)
 {
+    global $table;
+
     /**
      * Conditional classes switch the list on or off
      */
@@ -53,7 +55,9 @@ function PMA_RTE_getList($type, $items)
         break;
     case 'trigger':
         $retval .= "            <th>" . __('Name') . "</th>\n";
-        $retval .= "            <th>" . __('Table') . "</th>\n";
+        if (empty($table)) {
+            $retval .= "            <th>" . __('Table') . "</th>\n";
+        }
         $retval .= "            <th colspan='3'>" . __('Action') . "</th>\n";
         $retval .= "            <th>" . __('Time') . "</th>\n";
         $retval .= "            <th>" . __('Event') . "</th>\n";
@@ -220,11 +224,13 @@ function PMA_TRI_getRowForList($trigger, $rowclass = '')
     $retval .= "                    " . htmlspecialchars($trigger['name']) . "\n";
     $retval .= "                </strong>\n";
     $retval .= "            </td>\n";
-    $retval .= "            <td>\n";
-    $retval .= "                <a href='db_triggers.php?db={$db}"
-                                 . "&table={$trigger['table']}'>"
-                                 . $trigger['table'] . "</a>\n";
-    $retval .= "            </td>\n";
+    if (empty($table)) {
+        $retval .= "            <td>\n";
+        $retval .= "                <a href='db_triggers.php?db={$db}"
+                                     . "&table={$trigger['table']}'>"
+                                     . $trigger['table'] . "</a>\n";
+        $retval .= "            </td>\n";
+    }
     $retval .= "            <td>\n";
     if (PMA_currentUserHasPrivilege('TRIGGER', $db, $table)) {
         $retval .= '                <a ' . $ajax_class['edit']


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list