summaryrefslogtreecommitdiff
path: root/rt
diff options
context:
space:
mode:
authorMark Wells <mark@freeside.biz>2016-11-27 16:43:19 -0800
committerMark Wells <mark@freeside.biz>2016-11-27 21:14:25 -0800
commit7c5f50804027577aac17d0fcefedcd0d0b6ca180 (patch)
tree68273b26685ca221d44ef95511ded74ecc589e6e /rt
parentbcfa8b9c306cc871b5851d7c07ef0759eb1bcb31 (diff)
add RT ACL for bulk updating tickets, #72964
Conflicts: rt/lib/RT/System.pm
Diffstat (limited to 'rt')
-rw-r--r--rt/FREESIDE_MODIFIED6
-rw-r--r--rt/lib/RT/System.pm3
-rwxr-xr-xrt/share/html/Elements/Tabs5
-rwxr-xr-xrt/share/html/Search/Bulk.html7
-rwxr-xr-xrt/share/html/Ticket/Elements/Tabs13
5 files changed, 29 insertions, 5 deletions
diff --git a/rt/FREESIDE_MODIFIED b/rt/FREESIDE_MODIFIED
index 05ffb2a46..db5212d5a 100644
--- a/rt/FREESIDE_MODIFIED
+++ b/rt/FREESIDE_MODIFIED
@@ -171,3 +171,9 @@ share/html/Search/Schedule.html
share/html/Elements/CalendarSlotSchedule
share/html/Ticket/Display.html
+# BulkUpdateTickets ACL
+lib/RT/System.pm
+share/html/Elements/Tabs
+share/html/Search/Bulk.html
+share/html/Ticket/Elements/Tabs
+
diff --git a/rt/lib/RT/System.pm b/rt/lib/RT/System.pm
index 388a1fd6e..af7a22bbb 100644
--- a/rt/lib/RT/System.pm
+++ b/rt/lib/RT/System.pm
@@ -92,6 +92,9 @@ __PACKAGE__->AddRight( General => LoadSavedSearch => 'Allow loading of saved
__PACKAGE__->AddRight( General => CreateSavedSearch => 'Allow creation of saved searches'); # loc
__PACKAGE__->AddRight( Admin => ExecuteCode => 'Allow writing Perl code in templates, scrips, etc'); # loc
+#freeside
+__PACKAGE__->AddRight( Staff => BulkUpdateTickets => 'Bulk update tickets');
+
=head2 AvailableRights
Returns a hashref of available rights for this object. The keys are the
diff --git a/rt/share/html/Elements/Tabs b/rt/share/html/Elements/Tabs
index 297d907a2..aef27edf4 100755
--- a/rt/share/html/Elements/Tabs
+++ b/rt/share/html/Elements/Tabs
@@ -847,7 +847,10 @@ my $build_main_nav = sub {
}
if ( $has_query ) {
- $current_search_menu->child( bulk => title => loc('Bulk Update'), path => "/Search/Bulk.html$args" );
+ #freeside
+ if ( $session{'CurrentUser'}->HasRight( Right => 'BulkUpdateTickets', Object => RT->System ) ) {
+ $current_search_menu->child( bulk => title => loc('Bulk Update'), path => "/Search/Bulk.html$args" );
+ }
$current_search_menu->child( chart => title => loc('Chart'), path => "/Search/Chart.html$args" );
#formerly Callbacks/RTx-Calendar/Ticket/Element/Tabs/Default
diff --git a/rt/share/html/Search/Bulk.html b/rt/share/html/Search/Bulk.html
index bacd96c3f..38b29fe33 100755
--- a/rt/share/html/Search/Bulk.html
+++ b/rt/share/html/Search/Bulk.html
@@ -203,6 +203,13 @@ unless ( defined $Rows ) {
}
my $title = loc("Update multiple tickets");
+#freeside
+unless ( $session{'CurrentUser'}
+ ->HasRight( Right => 'BulkUpdateTickets', Object => RT->System) )
+{
+ Abort('You are not allowed to bulk-update tickets.');
+}
+
# Iterate through the ARGS hash and remove anything with a null value.
map ( $ARGS{$_} =~ /^$/ && ( delete $ARGS{$_} ), keys %ARGS );
diff --git a/rt/share/html/Ticket/Elements/Tabs b/rt/share/html/Ticket/Elements/Tabs
index 2f89dc61c..bcc97e52a 100755
--- a/rt/share/html/Ticket/Elements/Tabs
+++ b/rt/share/html/Ticket/Elements/Tabs
@@ -326,10 +326,15 @@ if ($has_query) {
title => loc('Show Results'),
};
- $tabs->{"j"} = {
- path => "Search/Bulk.html$args",
- title => loc('Bulk Update'),
- };
+ #freeside
+ if ( $session{'CurrentUser'}
+ ->HasRight(Right => 'BulkUpdateTickets', Object => $RT::System) )
+ {
+ $tabs->{"j"} = {
+ path => "Search/Bulk.html$args",
+ title => loc('Bulk Update'),
+ };
+ }
$tabs->{"k"} = {
path => "Search/Chart.html$args",