[Rt-commit] rt branch, 4.2/admin-scrip-queue, created. rt-4.2.1-43-g27c90ae

[Alex Vandiver]

The branch, 4.2/admin-scrip-queue has been created
        at  27c90ae7149e42412a5416fbcd683af4be779b9a (commit)

- Log -----------------------------------------------------------------
commit 27c90ae7149e42412a5416fbcd683af4be779b9a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Mon Dec 2 11:38:57 2013 -0500

    Correct old "Queue" and "QueueId" columns which still assumed scrips applied to 1 or all queues

diff --git a/share/html/Elements/RT__Scrip/ColumnMap b/share/html/Elements/RT__Scrip/ColumnMap
index 7964ded..90176d8 100644
--- a/share/html/Elements/RT__Scrip/ColumnMap
+++ b/share/html/Elements/RT__Scrip/ColumnMap
@@ -55,13 +55,16 @@ my $COLUMN_MAP = {
     Queue => {
         title     => 'Queue', # loc
         value     => sub {
-            return $_[0]->QueueObj->Name if $_[0]->Queue;
-            return $_[0]->loc('Global');
+            return $_[0]->loc('Global') if $_[0]->IsGlobal;
+            return join(", ", map {$_->Name} @{$_[0]->AddedTo->ItemsArrayRef});
         },
     },
     QueueId => {
         title     => 'Queue', # loc
-        value     => sub { $_[0]->Queue },
+        value     => sub {
+            return 0 if $_[0]->IsGlobal;
+            return join(", ", map {$_->Id} @{$_[0]->AddedTo->ItemsArrayRef});
+        },
     },
     Condition => {
         title     => 'Condition', # loc

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