Bug 8015: QA Followup 2

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 899dec1..569b7f8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -257,6 +257,12 @@ function setSelectByValue( selectId, value ) {
     <div id="yui-main">
         <div class="yui-b">
             <h2>MARC modification templates</h2>
+            
+            [% IF error %]
+                [% IF error == 'no_from_field' %]
+                    <div class="dialog message">Error: no field value specified.</div>
+                [% END %]
+            [% END %]
 
             [% IF ( TemplatesLoop ) %]
 
@@ -355,7 +361,9 @@ function setSelectByValue( selectId, value ) {
                                         [% IF ( ActionsLoo.conditional_comparison_equals ) %] matches [% END %]
                                         [% IF ( ActionsLoo.conditional_comparison_not_equals ) %] does not match [% END %]
 
-                                        [% IF ( ActionsLoo.conditional_regex ) %] RegEx m/[% END %]<strong>[% ActionsLoo.conditional_value %]/</strong>
+                                        [% IF ( ActionsLoo.conditional_regex ) %] RegEx m/[% END %]
+                                        <strong>[% ActionsLoo.conditional_value %]</strong>
+                                        [% IF ( ActionsLoo.conditional_regex ) %]/[% END %]
                                     [% END %]
                                 </td>
                                 <td>[% ActionsLoo.description %]</td>

diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl
index f9c3ee1..4f9323f 100755 (executable)
--- a/tools/marc_modification_templates.pl
+++ b/tools/marc_modification_templates.pl
@@ -67,53 +67,40 @@ if ( $op eq "create_template" ) {
   my $conditional_subfield = $cgi->param('conditional_subfield');
   my $conditional_comparison = $cgi->param('conditional_comparison');
   my $conditional_value = $cgi->param('conditional_value');
-  my $conditional_regex = $cgi->param('conditional_regex') eq 'on';
+  my $conditional_regex = ( $cgi->param('conditional_regex') eq 'on' ) ? 1 : 0;
   my $description = $cgi->param('description');
 
-  unless ( $mmta_id ) {
-    AddModificationTemplateAction(
-      $template_id,
-      $action,
-      $field_number,
-      $from_field,
-      $from_subfield,
-      $field_value,
-      $to_field,
-      $to_subfield,
-      $to_regex_search,
-      $to_regex_replace,
-      $to_regex_modifiers,
-      $conditional,
-      $conditional_field,
-      $conditional_subfield,
-      $conditional_comparison,
-      $conditional_value,
-      $conditional_regex,
-      $description
-    );
-  } else {
-    ModModificationTemplateAction(
-      $mmta_id,
-      $action,
-      $field_number,
-      $from_field,
-      $from_subfield,
-      $field_value,
-      $to_field,
-      $to_subfield,
-      $to_regex_search,
-      $to_regex_replace,
-      $to_regex_modifiers,
-      $conditional,
-      $conditional_field,
-      $conditional_subfield,
-      $conditional_comparison,
-      $conditional_value,
-      $conditional_regex,
-      $description
-    );
-
-  }
+    if ($from_field) {
+        unless ($mmta_id) {
+            AddModificationTemplateAction(
+                $template_id,            $action,
+                $field_number,           $from_field,
+                $from_subfield,          $field_value,
+                $to_field,               $to_subfield,
+                $to_regex_search,        $to_regex_replace,
+                $to_regex_modifiers,     $conditional,
+                $conditional_field,      $conditional_subfield,
+                $conditional_comparison, $conditional_value,
+                $conditional_regex,      $description
+            );
+        }
+        else {
+            ModModificationTemplateAction(
+                $mmta_id,                $action,
+                $field_number,           $from_field,
+                $from_subfield,          $field_value,
+                $to_field,               $to_subfield,
+                $to_regex_search,        $to_regex_replace,
+                $to_regex_modifiers,     $conditional,
+                $conditional_field,      $conditional_subfield,
+                $conditional_comparison, $conditional_value,
+                $conditional_regex,      $description
+            );
+        }
+    }
+    else {
+        $template->param( error => 'no_from_field' );
+    }
 
 } elsif ( $op eq "delete_action" ) {
   DelModificationTemplateAction( $cgi->param('mmta_id') );