[Rt-commit] r9395 - in rtir/branches/2.3-EXPERIMENTAL: html/RTIR/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Mon Oct 22 15:03:00 2007
New Revision: 9395

Modified:
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/EditConstituency
   rtir/branches/2.3-EXPERIMENTAL/lib/RT/IR.pm

Log:
* fix constituency rights check

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/EditConstituency
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/EditConstituency	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Elements/EditConstituency	Mon Oct 22 15:03:00 2007
@@ -81,15 +81,20 @@
 </%ARGS>
 
 <%METHOD options>
-% my $selected;
-% my $CFVs = $CustomField->Values;
-% my @levels;
-% my $main_queue = RT::Queue->new($session{'CurrentUser'});
-% $main_queue->LoadByCols(Name => 'Incidents');
-% my $show_all = 0;
-% if ($main_queue->CurrentUserHasRight('OwnTicket')) {
-% $show_all = 1;
-% }
+<%INIT>
+my $selected;
+my $CFVs = $CustomField->Values;
+my @levels;
+
+my $main_queue = RT::Queue->new($session{'CurrentUser'});
+if ( $Object ) {
+    $main_queue->Load( $Object->Queue );
+} else {
+    $main_queue->Load( $m->request_args->{'Queue'} || 'Incidents' );
+}
+$main_queue->{'disable_constituency_right_check'} = 1;
+my $show_all = $main_queue->CurrentUserHasRight('OwnTicket') ? 1 : 0;
+</%INIT>
 
 % while ( my $value = $CFVs->Next ) {
 %       my $name = $value->Name;

Modified: rtir/branches/2.3-EXPERIMENTAL/lib/RT/IR.pm
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/lib/RT/IR.pm	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/lib/RT/IR.pm	Mon Oct 22 15:03:00 2007
@@ -414,7 +414,9 @@
     };
 
     wrap 'RT::Queue::HasRight', pre => sub {
-        return if $_[0]->{'_for_ticket'} || !$_[0]->id;
+        return unless $_[0]->id;
+        return if $_[0]->{'disable_constituency_right_check'};
+        return if $_[0]->{'_for_ticket'};
         return unless $_[0]->__Value('Name') =~
             /^(Incidents|Incident Reports|Investigations|Blocks)$/i;