[Rt-commit] rt branch, 3.999-trunk, updated. 752e912e577ea30f8b433fb05d307f977d209e18

[sartak at bestpractical.com]

The branch, 3.999-trunk has been updated
       via  752e912e577ea30f8b433fb05d307f977d209e18 (commit)
      from  1e4c960ee149b9897f48251bb61d261abeac8617 (commit)

Summary of changes:
 lib/RT/Model/Ticket.pm |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit 752e912e577ea30f8b433fb05d307f977d209e18
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Dec 1 05:15:28 2009 -0500

    Move disabled-queue validation into validate_queue

diff --git a/lib/RT/Model/Ticket.pm b/lib/RT/Model/Ticket.pm
index 53e7946..03bcb60 100755
--- a/lib/RT/Model/Ticket.pm
+++ b/lib/RT/Model/Ticket.pm
@@ -429,19 +429,6 @@ sub create {
         return ( 0, 0, _('Could not create ticket. queue not set') );
     }
 
-    if ( $queue_obj->disabled ) {
-        Jifty->log->debug( "$self Disabled queue '"
-              . $queue_obj->name
-              . "' given for ticket creation." );
-        return (
-            0, 0,
-            _(
-                'Could not create ticket in disabled queue "%1"',
-                $queue_obj->name
-            )
-        );
-    }
-
     #Now that we have a queue, Check the ACLS
             die caller unless $self->current_user->id;
     unless (
@@ -987,6 +974,8 @@ sub transaction_addresses {
 sub validate_queue {
     my $self  = shift;
     my $value = shift;
+    my $other = shift;
+    my $meta  = shift;
 
     if ( !$value ) {
         Jifty->log->warn( " RT:::Queue::validate_Queue called with a null value. this isn't ok." );
@@ -996,6 +985,19 @@ sub validate_queue {
     my $queue_obj = RT::Model::Queue->new( current_user => $self->current_user );
     my $id        = $queue_obj->load($value);
 
+    if ( $meta->{for} eq 'create' && $queue_obj->disabled ) {
+        Jifty->log->debug( "$self Disabled queue '"
+              . $queue_obj->name
+              . "' given for ticket creation." );
+        return (
+            0,
+            _(
+                'Could not create ticket in disabled queue "%1"',
+                $queue_obj->name
+            )
+        );
+    }
+
     if ($id) {
         return (1);
     } else {

-----------------------------------------------------------------------