[Rt-commit] rt branch, 4.0/querybuilder-queue-limits, created. rt-4.0.2-129-gef85616

[Alex Vandiver]

The branch, 4.0/querybuilder-queue-limits has been created
        at  ef856168bceecfb87f88383429f11982d57acf08 (commit)

- Log -----------------------------------------------------------------
commit 61d31ad11769388bff89df2593631a352196629c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Feb 15 11:58:14 2012 -0500

    13c9428 half-added caching which couldn't work to %Queues; remove it

diff --git a/share/html/Elements/SelectOwner b/share/html/Elements/SelectOwner
index 43f051f..28612aa 100755
--- a/share/html/Elements/SelectOwner
+++ b/share/html/Elements/SelectOwner
@@ -57,13 +57,9 @@ if ($TicketObj) {
     @objects = ($QueueObj);
 } elsif (%Queues) {
     for my $name (keys %Queues) {
-        if (ref $name) {
-            push @objects, $name;
-        } else {
-            my $q = RT::Queue->new($session{'CurrentUser'});
-            $q->Load($name);
-            push @objects, $q;
-        }
+        my $q = RT::Queue->new($session{'CurrentUser'});
+        $q->Load($name);
+        push @objects, $q;
     }
 } else {
     # Let's check rights on an empty queue object. that will do a search

commit d0acc689e25ccb1ec60f5feea4f8d3b7d7e223de
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Feb 15 12:15:04 2012 -0500

    Note in UPGRADING the components touched as part of this branch

diff --git a/docs/UPGRADING-4.0 b/docs/UPGRADING-4.0
index a930134..dad0485 100644
--- a/docs/UPGRADING-4.0
+++ b/docs/UPGRADING-4.0
@@ -106,3 +106,19 @@ with
   database level.
 
 *******
+
+UPGRADING FROM 4.0.5 and earlier - Changes:
+
+The web-based query builder now uses Queue limits to restrict the set of
+displayed statuses and owners.  As part of this change, the %cfqueues
+parameter was renamed to %Queues; if you have local modifications to any
+of the following Mason templates, this feature will not function
+correctly:
+
+    share/html/Elements/SelectOwner
+    share/html/Elements/SelectStatus
+    share/html/Prefs/Search.html
+    share/html/Search/Build.html
+    share/html/Search/Elements/BuildFormatString
+    share/html/Search/Elements/PickCFs
+    share/html/Search/Elements/PickCriteria

commit ef856168bceecfb87f88383429f11982d57acf08
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Feb 15 19:26:34 2012 -0500

    Hash defaults should always be lists, not single elements

diff --git a/share/html/Search/Elements/PickCFs b/share/html/Search/Elements/PickCFs
index 86441d8..dcee057 100644
--- a/share/html/Search/Elements/PickCFs
+++ b/share/html/Search/Elements/PickCFs
@@ -119,5 +119,5 @@ $m->callback( Conditions => \@lines, Queues => \%queues );
 </%INIT>
 
 <%ARGS>
-%queues => undef
+%queues => ()
 </%ARGS>
diff --git a/share/html/Search/Elements/PickCriteria b/share/html/Search/Elements/PickCriteria
index 5be8e98..2ff429c 100644
--- a/share/html/Search/Elements/PickCriteria
+++ b/share/html/Search/Elements/PickCriteria
@@ -68,5 +68,5 @@
 <%ARGS>
 $addquery => 0
 $query => undef
-%queues => undef
+%queues => ()
 </%ARGS>

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