[Rt-commit] rt branch, 3.8-trunk, updated. 8883ebecb19f06c660623e6a035f949e4eaacde8

[sartak at bestpractical.com]

The branch, 3.8-trunk has been updated
       via  8883ebecb19f06c660623e6a035f949e4eaacde8 (commit)
       via  8453c06e64439f50ad56955691326d3a15b926e0 (commit)
      from  74005de67450688b8d60f3d658b2e68198c12347 (commit)

Summary of changes:
 share/html/Dashboards/Elements/ShowPortlet/search |    5 +++--
 share/html/Elements/ShowSearch                    |   21 ++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

- Log -----------------------------------------------------------------
commit 8453c06e64439f50ad56955691326d3a15b926e0
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Aug 28 22:54:15 2009 -0400

    Allow hiding the Edit link in ShowSearch

diff --git a/share/html/Elements/ShowSearch b/share/html/Elements/ShowSearch
index 90ae551..41fd758 100644
--- a/share/html/Elements/ShowSearch
+++ b/share/html/Elements/ShowSearch
@@ -79,7 +79,7 @@ if ($SavedSearch) {
         $query_display_component
             = '/Search/Elements/' . $SearchArg->{SearchType};
         $query_link_url = RT->Config->Get('WebURL') . "/Search/$SearchArg->{SearchType}.html";
-    } else {
+    } elsif ($show_customize) {
         $customize = RT->Config->Get('WebPath') . '/Search/Build.html?'
             . $m->comp( '/Elements/QueryString',
             SavedSearchLoad => $SavedSearch );
@@ -98,9 +98,11 @@ if ($SavedSearch) {
     }
 
     $SearchArg = $user->Preferences( $search, $search->Content );
-    $customize = RT->Config->Get('WebPath') . '/Prefs/Search.html?'
-        . $m->comp( '/Elements/QueryString',
-            name => ref($search) . '-' . $search->Id );
+    if ($show_customize) {
+        $customize = RT->Config->Get('WebPath') . '/Prefs/Search.html?'
+            . $m->comp( '/Elements/QueryString',
+                name => ref($search) . '-' . $search->Id );
+    }
 }
 
 # ProcessedSearchArg is a search with overridings, but for link we use
@@ -140,9 +142,10 @@ my $QueryString = '?' . $m->comp( '/Elements/QueryString', %$SearchArg );
 
 </%init>
 <%ARGS>
-$Name          => undef
-$SavedSearch   => undef
-%Override      => ()
-$IgnoreMissing => undef
-$hideable      => 1
+$Name           => undef
+$SavedSearch    => undef
+%Override       => ()
+$IgnoreMissing  => undef
+$hideable       => 1
+$show_customize => 1
 </%ARGS>

commit 8883ebecb19f06c660623e6a035f949e4eaacde8
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Fri Aug 28 22:54:26 2009 -0400

    Don't show edit links for searches in mailed dashboards

diff --git a/share/html/Dashboards/Elements/ShowPortlet/search b/share/html/Dashboards/Elements/ShowPortlet/search
index b17859a..53c7b90 100644
--- a/share/html/Dashboards/Elements/ShowPortlet/search
+++ b/share/html/Dashboards/Elements/ShowPortlet/search
@@ -57,6 +57,7 @@ my @for_showsearch = $Dashboard->ShowSearchName($Portlet);
 
 <& /Elements/ShowSearch,
     @for_showsearch,
-    Override => { Rows => $Rows },
-    hideable => $Preview,
+    Override       => { Rows => $Rows },
+    hideable       => $Preview,
+    show_customize => $Preview,
 &>

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