rt 4.2.14 (#13852)

[freeside.git] / rt / share / html / Prefs / Quicksearch.html

diff --git a/rt/share/html/Prefs/Quicksearch.html b/rt/share/html/Prefs/Quicksearch.html
index 7142450..920d457 100644 (file)
--- a/rt/share/html/Prefs/Quicksearch.html
+++ b/rt/share/html/Prefs/Quicksearch.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2017 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -53,14 +53,24 @@
 <form method="post" action="Quicksearch.html" name="Preferences">
 <ul>
 % for my $queue (@queues) {
-<li><input type="checkbox" class="checkbox" name="Want-<%$queue->Name%>" value="1"
+<li><input type="checkbox" class="checkbox" id="Want-<%$queue->Name%>" name="Want-<%$queue->Name%>" value="1"
 % unless ($unwanted->{$queue->Name}) {
 checked="checked"
 % }
-/><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></li>
+/>
+<label for="Want-<%$queue->Name%>"><%$queue->Name%><% $queue->Description ? ': '.$queue->Description : '' %></label>
+</li>
 % }
 </ul>
-<& /Elements/Submit, Caption => loc("Save Changes"), Label => loc('Save'), Name => 'Save'&>
+<& /Elements/Submit,
+    Caption             => loc("Save Changes"),
+    Label               => loc('Save'),
+    Name                => 'Save',
+    Reset               => 1,
+    CheckAll            => 1,
+    ClearAll            => 1,
+    CheckboxNameRegex   => '/^Want-/',
+    &>
 
 </form>
 
@@ -71,15 +81,24 @@ my $user = $session{'CurrentUser'}->UserObj;
 my $unwanted = $user->Preferences('QuickSearch', {});
 my $Queues = RT::Queues->new($session{'CurrentUser'});
 $Queues->UnLimit;
-my @queues = grep {$_->CurrentUserHasRight('ShowTicket')} @{$Queues->ItemsArrayRef};
+
+my $right = 'ShowTicket';
+$m->callback(
+    CallbackName    => 'ModifyQueues',
+    Queues          => \$Queues,
+    Right           => \$right,
+    Unwanted        => $unwanted,
+);
+
+my @queues = grep { $right ? $_->CurrentUserHasRight($right) : 1 } @{$Queues->ItemsArrayRef};
 
 if ($ARGS{'Save'}) {
     for my $queue (@queues) {
         if ($ARGS{"Want-".$queue->Name}) {
-           delete $unwanted->{$queue->Name};
-       }
+            delete $unwanted->{$queue->Name};
+        }
         else {
-           ++$unwanted->{$queue->Name};
+            ++$unwanted->{$queue->Name};
         }
     }