rt 4.2.13 ticket#13852

[freeside.git] / rt / share / html / Admin / Global / Template.html

diff --git a/rt/share/html/Admin/Global/Template.html b/rt/share/html/Admin/Global/Template.html
index c7652e6..4e15dda 100755 (executable)
--- a/rt/share/html/Admin/Global/Template.html
+++ b/rt/share/html/Admin/Global/Template.html
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -46,14 +46,10 @@
 %#
 %# END BPS TAGGED BLOCK }}}
 <& /Admin/Elements/Header, Title => $title &>
-<& /Admin/Elements/SystemTabs, 
-    current_tab => 'Admin/Global/Templates.html', 
-    current_subtab => $current_subtab, 
-    subtabs => $subtabs, 
-    Title => $title &>
+<& /Elements/Tabs &>
 <& /Elements/ListActions, actions => \@results &>
 
-<form method="post" action="Template.html">
+<form method="post" name="ModifyTemplate" id="ModifyTemplate" action="Template.html">
 %if ($Create ) {
 <input type="hidden" class="hidden" name="Template" value="new" />
 % } else {
@@ -62,62 +58,57 @@
 
 %# hang onto the queue id
 <input type="hidden" class="hidden" name="Queue" value="<%$Queue%>" />
-<& /Admin/Elements/ModifyTemplate, Name => $TemplateObj->Name, Description =>
-$TemplateObj->Description, Content => $TemplateObj->Content &> 
+<& /Admin/Elements/ModifyTemplate,
+    Name        => $TemplateObj->Name // $ARGS{Name},
+    Description => $TemplateObj->Description // $ARGS{Description},
+    Content     => $TemplateObj->Content // $ARGS{Content},
+    Type        => $TemplateObj->Type // $ARGS{Type},
+&>
 <& /Elements/Submit, Label => $SubmitLabel, Reset => 1 &>
 </form>
 
 
 <%INIT>
 
-my $TemplateObj = new RT::Template($session{'CurrentUser'});
-my  ($title, @results, $current_subtab, $SubmitLabel);
+my $TemplateObj = RT::Template->new($session{'CurrentUser'});
+my  ($title, @results, $SubmitLabel);
 
-my $subtabs = {
-                A => { title => loc('Select'),
-                       path => "Admin/Global/Templates.html"
-                          },
-                B => { title => loc('New'),
-                       path => "Admin/Global/Template.html?Create=1&Queue=0",
-                       separator => 1,
-                          }
-             };
-
-if ($Create) {
-  $title = loc("Create a template");
-  $current_subtab = "Admin/Global/Template.html?Create=1&Queue=0";
-  $SubmitLabel = loc('Create');
-}
-
-else {
-  if (defined ($Template) && $Template eq 'new') {
-      my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name);
-      Abort(loc("Could not create template: [_1]", $msg)) unless ($val);
-     push @results, $msg;
-    }
-    else {
-       $TemplateObj->Load($Template) || Abort(loc('No Template'));
+if (!$Create) {
+    if (defined ($Template) && $Template eq 'new') {
+        my ($val, $msg) =  $TemplateObj->Create(Queue => $Queue, Name => $Name, Type => $Type);
+        push @results, $msg;
+    } else {
+        $TemplateObj->Load($Template) || Abort(loc('No Template'));
     }
-     $title = loc('Modify template [_1]', loc($TemplateObj->Name())); 
-     $SubmitLabel = loc('Save Changes');
-    
 }
+
 if ($TemplateObj->Id()) {
-  my @attribs = qw( Description Content Queue Name);
-  my @aresults = UpdateRecordObject( AttributesRef => \@attribs, 
-                                    Object => $TemplateObj, 
-                                    ARGSRef => \%ARGS);
-  $current_subtab = "Admin/Global/Template.html?Queue=0&Template=".$TemplateObj->Id();
-  $subtabs->{"C"} = { title => loc('Template #[_1]', $TemplateObj->Id()),
-                       path => "Admin/Global/Template.html?Queue=0&Template=".$TemplateObj->Id(),
-                       };
-  push @results, @aresults;
+    my @attribs = qw( Name Description Queue Type Content );
+    my @aresults = UpdateRecordObject( AttributesRef => \@attribs,
+                                       Object => $TemplateObj,
+                                       ARGSRef => \%ARGS);
+    push @results, @aresults;
+
+    my ($ok, $msg) = $TemplateObj->CompileCheck;
+    push @results, $msg if !$ok;
+} else {
+    $Create = 1;
 }
 
+if ($Create) {
+    $title = loc("Create a template");
+    $SubmitLabel = loc('Create');
+} else {
+    $title = loc('Modify template [_1]', loc($TemplateObj->Name()));
+    $SubmitLabel = loc('Save Changes');
+}
+
+
 </%INIT>
 <%ARGS>
-$Queue => undef
-$Template => undef
-$Create => undef
-$Name => undef
+$Queue => ''
+$Template => ''
+$Create => ''
+$Name => ''
+$Type => ''
 </%ARGS>