[Rt-commit] rt branch, 4.0/apply-scrips-to-multiple-queues, updated. rt-4.0.4-176-g103aa04

[Ruslan Zakirov]

The branch, 4.0/apply-scrips-to-multiple-queues has been updated
       via  103aa045f58a8fa7006780c360723582c6b86af4 (commit)
      from  1d9235fbf96df3aa0ca5c19d37659d6d3b820a8b (commit)

Summary of changes:
 lib/RT/Scrip.pm                         |    2 ++
 share/html/Admin/Elements/EditScrip     |    2 +-
 share/html/Elements/RT__Scrip/ColumnMap |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 103aa045f58a8fa7006780c360723582c6b86af4
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Mon Jan 9 18:03:53 2012 +0400

    scrip->IsGlobal method, alias to ->IsAdded(0)

diff --git a/lib/RT/Scrip.pm b/lib/RT/Scrip.pm
index 7086af5..2d872a8 100644
--- a/lib/RT/Scrip.pm
+++ b/lib/RT/Scrip.pm
@@ -220,6 +220,8 @@ sub Delete {
     return ( $self->SUPER::Delete(@_) );
 }
 
+sub IsGlobal { return shift->IsAdded(0) }
+
 sub IsAdded {
     my $self = shift;
     my $record = RT::ObjectScrip->new( $self->CurrentUser );
diff --git a/share/html/Admin/Elements/EditScrip b/share/html/Admin/Elements/EditScrip
index bc3ce32..8989f31 100755
--- a/share/html/Admin/Elements/EditScrip
+++ b/share/html/Admin/Elements/EditScrip
@@ -89,7 +89,7 @@
 
 % if ( $id ne 'new' && $added_to_any ) {
 <tr><td class="label"><&|/l&>Added</&>:</td><td class="value">\
-% if ( $scrip->IsAdded(0) ) {
+% if ( $scrip->IsGlobal ) {
 <% loc('Global') %>
 % } else {
 % my $added_to = $scrip->AddedTo;
diff --git a/share/html/Elements/RT__Scrip/ColumnMap b/share/html/Elements/RT__Scrip/ColumnMap
index 1b487c6..ca35068 100644
--- a/share/html/Elements/RT__Scrip/ColumnMap
+++ b/share/html/Elements/RT__Scrip/ColumnMap
@@ -117,7 +117,7 @@ my $COLUMN_MAP = {
         },
         value => sub {
             my $id = $_[0]->id;
-            return '' if $_[0]->IsAdded;
+            return '' if $_[0]->IsGlobal;
 
             my $name = 'RemoveScrip';
             my $arg = $m->request_args->{ $name };

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