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

[Ruslan Zakirov]

The branch, 4.0/apply-scrips-to-multiple-queues has been updated
       via  8f7634af69879f3adb44f7252c874546fcdc9813 (commit)
       via  7aa2280cce2a4504910608299c14fbe31f177631 (commit)
       via  1e0cfd6d31bf24b7e069103f3dd1dbde6cacc391 (commit)
      from  ed876e07b69176edd313b68255892d7eb1889c22 (commit)

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

- Log -----------------------------------------------------------------
commit 1e0cfd6d31bf24b7e069103f3dd1dbde6cacc391
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Dec 24 03:29:26 2011 +0400

    delete all applications when scrip is deleted

diff --git a/lib/RT/Scrip.pm b/lib/RT/Scrip.pm
index 8ae46b4..4147a23 100644
--- a/lib/RT/Scrip.pm
+++ b/lib/RT/Scrip.pm
@@ -215,6 +215,8 @@ sub Delete {
         return ( 0, $self->loc('Permission Denied') );
     }
 
+    RT::ObjectScrip->new( $self->CurrentUser )->DeleteAll( Scrip => $self );
+
     return ( $self->SUPER::Delete(@_) );
 }
 

commit 7aa2280cce2a4504910608299c14fbe31f177631
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Dec 24 03:58:09 2011 +0400

    only a few column maps can go as first thing in href

diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index edcdadd..11fef03 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -2466,8 +2466,8 @@ Set(%AdminSearchResultFormat,
         .q{,__AppliedTo__, __FriendlyType__, __FriendlyPattern__},
 
     Scrips =>
-        q{'<a href="__AdminURL__">__id__</a>/TITLE:#'}
-        .q{,'<a href="__AdminURL__">__Description__</a>/TITLE:Description'}
+        q{'<a href="__WebPath__/__AdminURL__">__id__</a>/TITLE:#'}
+        .q{,'<a href="__WebPath__/__AdminURL__">__Description__</a>/TITLE:Description'}
         .q{, __Condition__, __Action__, __Template__},
 
     Templates =>
diff --git a/share/html/Elements/RT__Scrip/ColumnMap b/share/html/Elements/RT__Scrip/ColumnMap
index a1c2a05..a53767a 100644
--- a/share/html/Elements/RT__Scrip/ColumnMap
+++ b/share/html/Elements/RT__Scrip/ColumnMap
@@ -97,7 +97,7 @@ my $COLUMN_MAP = {
     AdminURL => {
 	value     => sub {
             my $queue = $_[0]->AppliedTo->First;
-            my $res = RT->Config->Get('WebPath') .'/Admin';
+            my $res = 'Admin';
             if ( $queue ) {
                 $res .= '/Queues/Scrip.html?Queue='. $queue->id .'&';
             } else {

commit 8f7634af69879f3adb44f7252c874546fcdc9813
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Sat Dec 24 03:58:53 2011 +0400

    typo in method call

diff --git a/share/html/Elements/RT__Scrip/ColumnMap b/share/html/Elements/RT__Scrip/ColumnMap
index a53767a..1b487c6 100644
--- a/share/html/Elements/RT__Scrip/ColumnMap
+++ b/share/html/Elements/RT__Scrip/ColumnMap
@@ -96,7 +96,7 @@ my $COLUMN_MAP = {
 
     AdminURL => {
 	value     => sub {
-            my $queue = $_[0]->AppliedTo->First;
+            my $queue = $_[0]->AddedTo->First;
             my $res = 'Admin';
             if ( $queue ) {
                 $res .= '/Queues/Scrip.html?Queue='. $queue->id .'&';

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