projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[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
93d0a5f
..
2642aa5
100644
(file)
--- a/
rt/share/html/Prefs/Quicksearch.html
+++ b/
rt/share/html/Prefs/Quicksearch.html
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
5
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-46,10
+46,7
@@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title &>
-<& /Prefs/Elements/Tabs,
- current_tab => 'Prefs/MyRT.html',
- current_subtab => 'Prefs/Quicksearch.html',
- Title => $title
+<& /Elements/Tabs
&>
<& /Elements/ListActions, actions => \@actions &>
<h1><&|/l&>Select queues to be displayed on the "RT at a glance" page</&></h1>
&>
<& /Elements/ListActions, actions => \@actions &>
<h1><&|/l&>Select queues to be displayed on the "RT at a glance" page</&></h1>
@@
-60,22
+57,39
@@
% unless ($unwanted->{$queue->Name}) {
checked="checked"
% }
% unless ($unwanted->{$queue->Name}) {
checked="checked"
% }
-/><%$queue->Name%>
: <%$queue->Description
%></li>
+/><%$queue->Name%>
<% $queue->Description ? ': '.$queue->Description : ''
%></li>
% }
</ul>
% }
</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>
<%INIT>
my @actions;
my $title = loc("Customize").' '.loc("Quick search");
</form>
<%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'});
$Queues->UnLimit;
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{'Save'}) {
for my $queue (@queues) {
@@
-89,9
+103,6
@@
if ($ARGS{'Save'}) {
my ($ok, $msg) = $user->SetPreferences('QuickSearch', $unwanted);
push @actions, $ok ? loc('Preferences saved.') : $msg;
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>
}
</%INIT>