[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-918-g1b4ee61

[Alex Vandiver]

The branch, 3.9-trunk has been updated
       via  1b4ee615b4e540c5e792d884679aac73aa2944cf (commit)
       via  2113a22ca34a258f013fe3bf4db1d86a0ab42323 (commit)
      from  afd75746e6a6dbda2e9b1b7e3ca690f1480b66ca (commit)

Summary of changes:
 share/html/Elements/QueueSummaryByLifecycle |    5 ++---
 share/html/Elements/Quicksearch             |    1 -
 share/html/Prefs/Quicksearch.html           |    4 ----
 3 files changed, 2 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 2113a22ca34a258f013fe3bf4db1d86a0ab42323
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 16 19:52:29 2010 -0500

    Remove references to Quicksearch cache which doesn't exist anymore

diff --git a/share/html/Elements/QueueSummaryByLifecycle b/share/html/Elements/QueueSummaryByLifecycle
index e1f07df..bb4a5c4 100644
--- a/share/html/Elements/QueueSummaryByLifecycle
+++ b/share/html/Elements/QueueSummaryByLifecycle
@@ -140,7 +140,6 @@ while ( my $entry = $report->Next ) {
 }
 </%INIT>
 <%ARGS>
-$cache => undef
 $queue_filter => undef
 @statuses => ()
 </%ARGS>
diff --git a/share/html/Elements/Quicksearch b/share/html/Elements/Quicksearch
index 0ac31a1..b7b1783 100644
--- a/share/html/Elements/Quicksearch
+++ b/share/html/Elements/Quicksearch
@@ -53,7 +53,6 @@
     titleright_href => RT->Config->Get('WebPath').'/Prefs/Quicksearch.html',
 &>
 <& $comp,
-   cache => 'quick_search_queues',
    queue_filter => sub { $_->CurrentUserHasRight('ShowTicket') && !exists $unwanted->{$_->Name} },
 &>
 </&>
diff --git a/share/html/Prefs/Quicksearch.html b/share/html/Prefs/Quicksearch.html
index 497a82a..93bd399 100644
--- a/share/html/Prefs/Quicksearch.html
+++ b/share/html/Prefs/Quicksearch.html
@@ -67,7 +67,6 @@ checked="checked"
 <%INIT>
 my @actions;
 my $title = loc("Customize").' '.loc("Quick search");
-# The queue list is not loaded from cache, so it might be a bit inconsistent
 my $user = $session{'CurrentUser'}->UserObj;
 my $unwanted = $user->Preferences('QuickSearch', {});
 my $Queues = RT::Queues->new($session{'CurrentUser'});
@@ -86,9 +85,6 @@ if ($ARGS{'Save'}) {
 
     my ($ok, $msg) = $user->SetPreferences('QuickSearch', $unwanted);
     push @actions, $ok ? loc('Preferences saved.') : $msg;
-
-    # Let QueueSummary rebuild the cache
-    delete $session{'quick_search_queues'};
 }
 
 </%INIT>

commit 1b4ee615b4e540c5e792d884679aac73aa2944cf
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 16 20:12:26 2010 -0500

    Add a SQL filter callback, in case the Filter callback can be more succinctly expressed in SQL

diff --git a/share/html/Elements/QueueSummaryByLifecycle b/share/html/Elements/QueueSummaryByLifecycle
index bb4a5c4..cba4e5f 100644
--- a/share/html/Elements/QueueSummaryByLifecycle
+++ b/share/html/Elements/QueueSummaryByLifecycle
@@ -88,11 +88,11 @@ for my $queue (@queues) {
 % }
 <%INIT>
 
-my @queues;
 my $Queues = RT::Queues->new( $session{'CurrentUser'} );
 $Queues->UnLimit();
- at queues = grep $queue_filter->($_), @{ $Queues->ItemsArrayRef };
+$m->callback( CallbackName => 'SQLFilter', Queues => $Queues );
 
+my @queues = grep $queue_filter->($_), @{ $Queues->ItemsArrayRef };
 $m->callback( CallbackName => 'Filter', Queues => \@queues );
 
 @queues = map {

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