[freeside-commits] freeside/FS/FS TicketSystem.pm, 1.10.2.4, 1.10.2.5

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv29715/FS/FS

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	TicketSystem.pm 
Log Message:
combine ticket notification scrips, #15353

Index: TicketSystem.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/TicketSystem.pm,v
retrieving revision 1.10.2.4
retrieving revision 1.10.2.5
diff -u -w -d -r1.10.2.4 -r1.10.2.5
--- TicketSystem.pm	13 Oct 2011 21:52:04 -0000	1.10.2.4
+++ TicketSystem.pm	9 Dec 2011 18:50:54 -0000	1.10.2.5
@@ -136,7 +136,8 @@
 
   # Load from RT data file
   our (@Groups, @Users, @ACL, @Queues, @ScripActions, @ScripConditions,
-       @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final);
+       @Templates, @CustomFields, @Scrips, @Attributes, @Initial, @Final,
+       %Delete_Scrips);
   my $datafile = '%%%RT_PATH%%%/etc/initialdata';
   eval { require $datafile };
   if ( $@ ) {
@@ -211,6 +212,11 @@
       my ($val, $msg) = $item->Delete;
       warn "error deleting scrip: $msg\n" if !$val;
     }
+    elsif ( exists $Delete_Scrips{$c}{$a}{$t} and $item->Creator == 1 ) {
+      warn "Deleting obsolete scrip $c $a [$t]\n";
+      my ($val, $msg) = $item->Delete;
+      warn "error deleting scrip: $msg\n" if !$val;
+    }
     else {
       $scrip{$c}{$a}{$t} = $item->id;
     }