[Rt-commit] r7888 - in rt/branches/QUEBEC-EXPERIMENTAL: . html/SelfService sbin

[ruz at bestpractical.com]

Author: ruz
Date: Wed May 16 13:58:04 2007
New Revision: 7888

Modified:
   rt/branches/QUEBEC-EXPERIMENTAL/   (props changed)
   rt/branches/QUEBEC-EXPERIMENTAL/html/SelfService/Display.html
   rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Record.pm
   rt/branches/QUEBEC-EXPERIMENTAL/releng.cnf
   rt/branches/QUEBEC-EXPERIMENTAL/sbin/rt-test-dependencies.in

Log:
3.4 -> QUEBEC

 r3911 at cubic-pc (orig r6135):  ruz | 2006-10-01 01:38:39 +0400
 * there is code exists that call My::Class->_ClassAccessible
 r3944 at cubic-pc (orig r6153):  jesse | 2006-10-04 11:42:12 +0400
 
 r4078 at cubic-pc (orig r6238):  jesse | 2006-10-20 05:16:44 +0400
  r28958 at pinglin:  jesse | 2006-10-19 21:16:43 -0400
   * 3.4.6
 
 r4079 at cubic-pc (orig r6355):  jesse | 2006-11-03 01:02:55 +0300
  r29735 at pinglin:  jesse | 2006-11-02 17:02:19 -0500
  * UNIVERSAL::require is a dependency
 
 r4426 at cubic-pc (orig r6702):  jesse | 2007-01-03 06:14:39 +0300
  r46721 at pinglin:  jesse | 2007-01-02 22:13:53 -0500
  * Fix display of the selfservice "Display" page after create on the web. Thanks to Wilson Chow for finding the issue
 
 r4667 at cubic-pc (orig r7045):  falcone | 2007-02-21 22:36:40 +0300
  r16827 at ketch:  falcone | 2007-02-21 14:35:42 -0500
  * we've fixed a lot of bugs since 1.3
 


Modified: rt/branches/QUEBEC-EXPERIMENTAL/html/SelfService/Display.html
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/html/SelfService/Display.html	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/html/SelfService/Display.html	Wed May 16 13:58:04 2007
@@ -158,16 +158,9 @@
                 Why => loc( "Couldn't load ticket '[_1]'", $id ) );
             $m->abort();
         }
-    }
 
     # }}}
 
-    unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
-        $m->comp( 'Error.html',
-            Why => loc("No permission to display that ticket") );
-        $m->abort();
-    }
-
     my ( $code, $msg );
 
     #Update the status
@@ -205,6 +198,13 @@
     push (@results, @cfupdates);
 
     # }}}
+    }
+
+    unless ( $Ticket->CurrentUserHasRight('ShowTicket') ) {
+        $m->comp( 'Error.html',
+            Why => loc("No permission to display that ticket") );
+        $m->abort();
+    }
 
     my $Transactions = $Ticket->Transactions;
 

Modified: rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Record.pm
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Record.pm	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/lib/RT/Record.pm	Wed May 16 13:58:04 2007
@@ -748,7 +748,7 @@
 
 sub _ClassAccessible {
     my $self = shift;
-    return $_TABLE_ATTR->{ref($self)};
+    return $_TABLE_ATTR->{ ref($self) || $self };
 }
 
 =head2 _Accessible COLUMN ATTRIBUTE

Modified: rt/branches/QUEBEC-EXPERIMENTAL/releng.cnf
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/releng.cnf	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/releng.cnf	Wed May 16 13:58:04 2007
@@ -1,5 +1,5 @@
 PRODUCT			        = rt
-TAG			            = 3.4.6rc1
+TAG			            = 3.4.6
 CANONICAL_REPO		    = svn+ssh://svn.bestpractical.com/svn/bps-public/rt/
 TAGS		            = tags/
 TRUNK	                = branches/3.4-RELEASE

Modified: rt/branches/QUEBEC-EXPERIMENTAL/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/QUEBEC-EXPERIMENTAL/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/QUEBEC-EXPERIMENTAL/sbin/rt-test-dependencies.in	Wed May 16 13:58:04 2007
@@ -172,7 +172,8 @@
 File::Temp
 Term::ReadKey
 Text::Autoformat
-Text::Quoted 1.3
+Text::Quoted 2.02
+UNIVERSAL::require
 Tree::Simple 1.04
 Scalar::Util
 Module::Versions::Report