[Bps-public-commit] r19783 - in RT-BugTracker/html: Callbacks/BugTracker/Ticket/Create.html

[sartak at bestpractical.com]

Author: sartak
Date: Thu May 28 14:08:21 2009
New Revision: 19783

Modified:
   RT-BugTracker/html/Callbacks/BugTracker/Ticket/Create.html/FormStart
   RT-BugTracker/html/Ticket/Create.html

Log:
Move the disabled check to the earliest callback we have

Modified: RT-BugTracker/html/Callbacks/BugTracker/Ticket/Create.html/FormStart
==============================================================================
--- RT-BugTracker/html/Callbacks/BugTracker/Ticket/Create.html/FormStart	(original)
+++ RT-BugTracker/html/Callbacks/BugTracker/Ticket/Create.html/FormStart	Thu May 28 14:08:21 2009
@@ -7,6 +7,11 @@
 
 my $QueueObj = RT::Queue->new($session{CurrentUser});
 $QueueObj->Load($Queue);
+
+if ( $QueueObj->Disabled ) {
+    $m->comp('/Dist/Elements/ErrorDisabled', Queue => $QueueObj );
+    $m->abort;
+}
 </%init>
 
 <& /Dist/Elements/ShowNotes, Queue => $QueueObj &>

Modified: RT-BugTracker/html/Ticket/Create.html
==============================================================================
--- RT-BugTracker/html/Ticket/Create.html	(original)
+++ RT-BugTracker/html/Ticket/Create.html	Thu May 28 14:08:21 2009
@@ -321,12 +321,6 @@
 my $QueueObj = new RT::Queue($session{'CurrentUser'});
 $QueueObj->Load($Queue) || Abort(loc("Queue could not be loaded."));
 $Queue = $QueueObj->Name || $QueueObj->id;
-
-if ( $QueueObj->Disabled ) {
-    $m->comp('/Dist/Elements/ErrorDisabled', Queue => $QueueObj );
-    $m->abort;
-}
-
 my $CFs = $QueueObj->TicketCustomFields();
 my $TxnCFs = $QueueObj->TicketTransactionCustomFields();