Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / rt / share / html / Admin / Elements / EditScrip

diff --git a/rt/share/html/Admin/Elements/EditScrip b/rt/share/html/Admin/Elements/EditScrip
index eed23ff..be47507 100755 (executable)
--- a/rt/share/html/Admin/Elements/EditScrip
+++ b/rt/share/html/Admin/Elements/EditScrip
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -47,7 +47,7 @@
 %# END BPS TAGGED BLOCK }}}
 <& /Elements/ListActions, actions => \@actions &>
   
-<form method="post" action="Scrip.html">
+<form method="post" action="Scrip.html" id="ModifyScrip" name="ModifyScrip">
 <input type="hidden" class="hidden" name="id" value="<% $id %>" />
 <input type="hidden" class="hidden" name="Queue" value="<% $Queue %>" />
 
@@ -55,31 +55,50 @@
 <table>
 
 <tr><td align="right"><&|/l&>Description</&>:</td><td>
-<input name="Scrip-<% $id %>-Description" 
-    size="60"
+<tr><td class="label"><&|/l&>Description</&>:</td><td class="value">\
+<input name="Scrip-<% $id %>-Description" \
+    size="60" \
     value="<% $ARGS{"Scrip-$id-Description"} || $scrip->Description || '' %>" />
 </td></tr>
 
-<tr><td align="right"><&|/l&>Condition</&>:</td><td>
+<tr><td class="label"><&|/l&>Condition</&>:</td><td class="value">\
 <& /Admin/Elements/SelectScripCondition,
     Name => "Scrip-$id-ScripCondition",
     Default => $ARGS{"Scrip-$id-ScripCondition"} || $scrip->ConditionObj->Id,
+    ScripObj => $scrip,
+    Queue => $Queue,
 &></td></tr>
 
-<tr><td align="right"><&|/l&>Action</&>:</td><td>
+<& /Admin/Elements/EditScripOptions,
+    Name => "Condition",
+    Default => $ARGS{"Scrip-$id-ConditionRules"} || $scrip->ConditionRules,
+    Queue => $Queue,
+    ScripX => $ARGS{"Scrip-$id-ScripCondition"} || $scrip->ConditionObj->Id,
+&>
+
+<tr><td class="label"><&|/l&>Action</&>:</td><td class="value">\
 <& /Admin/Elements/SelectScripAction,
     Name => "Scrip-$id-ScripAction",
     Default => $ARGS{"Scrip-$id-ScripAction"} || $scrip->ActionObj->Id,
+    ScripObj => $scrip,
+    Queue => $Queue,
 &></td></tr>
 
-<tr><td align="right"><&|/l&>Template</&>:</td><td>
+<& /Admin/Elements/EditScripOptions,
+    Name => "Action",
+    Default => $ARGS{"Scrip-$id-ActionRules"} || $scrip->ActionRules,
+    Queue => $Queue,
+    ScripX => $ARGS{"Scrip-$id-ScripAction"} || $scrip->ActionObj->Id,
+&>
+
+<tr><td class="label"><&|/l&>Template</&>:</td><td class="value">\
 <& /Admin/Elements/SelectTemplate,
     Name => "Scrip-$id-Template",
     Default => $ARGS{"Scrip-$id-Template"} || $scrip->TemplateObj->Id,
     Queue => $Queue,
 &></td></tr>
 
-<tr><td align="right"><&|/l&>Stage</&>:</td><td>
+<tr><td class="label"><&|/l&>Stage</&>:</td><td class="value">\
 <& /Admin/Elements/SelectStage,
     Name => "Scrip-$id-Stage",
     Default => $ARGS{"Scrip-$id-Stage"} || $scrip->Stage,
@@ -88,6 +107,7 @@
 </table>
 </&>
 
+% if ($session{CurrentUser}->HasRight(Object => $RT::System, Right => 'ExecuteCode')) {
 <& /Elements/Submit,
     Label => $SubmitLabel,
     Reset => 1,
@@ -99,21 +119,21 @@
 <i><&|/l&>(Use these fields when you choose 'User Defined' for a condition or action)</&></i>
 </td></tr>
 
-<tr><td class="labeltop"><&|/l&>Custom condition</&>:</td><td>
+<tr><td class="labeltop"><&|/l&>Custom condition</&>:</td><td class="value">
 % my $code = $ARGS{"Scrip-$id-CustomIsApplicableCode"} || $scrip->CustomIsApplicableCode || '';
 % my $lines = @{[ $code =~ /\n/gs ]} + 3;
 % $lines = $min_lines if $lines < $min_lines;
 <textarea cols="80" rows="<% $lines %>" name="Scrip-<% $id %>-CustomIsApplicableCode"><% $code %></textarea>
 </td></tr>
 
-<tr><td class="labeltop"><&|/l&>Custom action preparation code</&>:</td><td>
+<tr><td class="labeltop"><&|/l&>Custom action preparation code</&>:</td><td class="value">
 % $code = $ARGS{"Scrip-$id-CustomPrepareCode"} || $scrip->CustomPrepareCode || '';
 % $lines = @{[ $code =~ /\n/gs ]} + 3;
 % $lines = $min_lines if $lines < $min_lines;
 <textarea cols="80" rows="<% $lines %>" name="Scrip-<% $id %>-CustomPrepareCode"><% $code %></textarea>
 </td></tr>
 
-<tr><td class="labeltop"><&|/l&>Custom action cleanup code</&>:</td><td>
+<tr><td class="labeltop"><&|/l&>Custom action cleanup code</&>:</td><td class="value">
 % $code = $ARGS{"Scrip-$id-CustomCommitCode"} || $scrip->CustomCommitCode || '';
 % $lines = @{[ $code =~ /\n/gs ]} + 3;
 % $lines = $min_lines if $lines < $min_lines;
@@ -123,6 +143,8 @@
 </table>
 </&>
 
+% }
+
 <& /Elements/Submit,
     Label => $SubmitLabel,
     Reset => 1,
@@ -149,6 +171,9 @@ unless ( $id ) {
 
 my $min_lines = 10;
 
+my ($ok, $msg) = $scrip->CompileCheck;
+push @actions, $msg if !$ok;
+
 </%init>
 
 <%ARGS>
@@ -165,6 +190,18 @@ $Queue => undef
 <%INIT>
 return ($id) unless $id;
 
+my @rules = ('ConditionRules', 'ActionRules');
+if ( exists($ARGS{"Scrip-$id-ScripCondition"}) ) {
+  foreach my $rules (@rules) {
+    my $prefix = join('-', 'Scrip', $id, $rules);
+    $ARGS{$prefix} = join("\n", map {
+      $_ =~ /^$rules-(.*)$/ ? 
+            ($1, $ARGS{$_}) : ()
+    } keys(%ARGS)
+    );
+  }
+}
+
 my $scrip = RT::Scrip->new( $session{'CurrentUser'} );
 if ( $id eq 'new' ) {
     return $scrip->Create(
@@ -177,6 +214,8 @@ if ( $id eq 'new' ) {
         CustomCommitCode       => $ARGS{"Scrip-new-CustomCommitCode"},
         CustomIsApplicableCode => $ARGS{"Scrip-new-CustomIsApplicableCode"},
         Stage                  => $ARGS{"Scrip-new-Stage"},
+        ConditionRules         => $ARGS{"Scrip-new-ConditionRules"},
+        ActionRules            => $ARGS{"Scrip-new-ActionRules"},
     );
 }
 else {
@@ -185,7 +224,8 @@ else {
         unless $scrip->id;
 
     my @attribs = qw(Queue ScripAction ScripCondition Template Stage
-        Description CustomPrepareCode CustomCommitCode CustomIsApplicableCode);
+        Description CustomPrepareCode CustomCommitCode CustomIsApplicableCode
+        ConditionRules ActionRules);
     my @results = UpdateRecordObject(
         AttributesRef   => \@attribs,
         AttributePrefix => 'Scrip-'.$scrip->Id,