Merge branch 'auftrag-loeschen-und-wiedervorlagen-2310'

[kivitendo-erp.git] / bin / mozilla / amtemplates.pl

diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl
index 1dc7344..f8c6972 100644 (file)
--- a/bin/mozilla/amtemplates.pl
+++ b/bin/mozilla/amtemplates.pl
@@ -31,6 +31,9 @@
 #
 #======================================================================
 
+use File::Find;
+
+use SL::DB::Default;
 use SL::AM;
 use SL::Form;
 
@@ -61,7 +64,7 @@ sub display_template {
 
   my $form     = $main::form;
 
-  $main::auth->assert('config');
+  $main::auth->assert('admin');
 
   $form->{edit} = 0;
   display_template_form();
@@ -74,7 +77,7 @@ sub edit_template {
 
   my $form     = $main::form;
 
-  $main::auth->assert('config');
+  $main::auth->assert('admin');
 
   $form->{edit} = 1;
   display_template_form();
@@ -89,7 +92,7 @@ sub save_template {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-  $main::auth->assert('config');
+  $main::auth->assert('admin');
 
   $form->isblank("formname", $locale->text("You're not editing a file.")) unless ($form->{type} eq "stylesheet");
 
@@ -111,9 +114,15 @@ sub display_template_form {
   my %myconfig = %main::myconfig;
   my $locale   = $main::locale;
 
-  $main::auth->assert('config');
+  $main::auth->assert('admin');
+
+  my $defaults = SL::DB::Default->get;
+  $form->error($::locale->text('No print templates have been created for this client yet. Please do so in the client configuration.')) if !$defaults->templates;
+
+  if ($form->{"formname"} =~ m|\.\.| || $form->{"formname"} =~ m|^/|) {
+    $form->{"formname"} =~ s|.*/||;
+  }
 
-  $form->{"formname"} =~ s|.*/||;
   my $format = $form->{"format"} eq "html" ? "html" : "tex";
 
   $form->{"title"} = $form->{"type"} eq "stylesheet" ? $locale->text("Edit the stylesheet") : $locale->text("Edit templates");
@@ -187,6 +196,36 @@ sub display_template_form {
 
     @values = sort({ $a->{"label"} cmp $b->{"label"} } @values);
 
+    #
+    # at the end: others/includes for tex
+    #
+    if ($format eq "tex") {
+      # search all .tex-files in template dir (recursively)
+      my @all_files;
+      find(
+        sub {
+          next if (-l $_ || -d $_);
+          next unless (-f $_ && $_ =~ m/.*?\.tex$/);
+
+          my $fname = $File::Find::name;
+          # remove template dir from name
+          $fname =~ s|^templates/[^/+]/||;
+          # remove .tex from name
+          $fname =~ s|.tex$||;
+
+          push(@all_files, $fname);
+
+          }, $defaults->templates);
+
+      # filter all files already set up (i.e. not already in @values)
+      my @other_files = grep { my $a=$_; not grep {$a eq $_->{value}} @values } @all_files;
+
+      # add other tex files
+      foreach my $o (@other_files) {
+        push(@values, { "value" => $o, "label" => $locale->text("Others")." ($o)" });
+      }
+    }
+
     $options{FORMNAME} = [ @values ];
 
     #
@@ -236,10 +275,7 @@ sub display_template_form {
 
     $options{"CAN_EDIT"} = $form->{"edit"};
 
-    if ($form->{edit}) {
-      $form->{fokus} = "Form.content";
-
-    } else {
+    if (!$form->{edit}) {
       $options{"content"}                 = "\n\n" if (!$options{"content"});
       $options{"SHOW_SECOND_EDIT_BUTTON"} = $options{"lines"} > 25;
     }