X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Famtemplates.pl;h=d32cf790a1b5602839ea4b6fd85cd6b2ca4c9d72;hb=59adfa36c82c4e021011c84c70b9384badea33aa;hp=9f21e22c7154cc605388df981215132771591ab1;hpb=4b85e0abf6e356485d8b99fd3a6ba62e13d1ebef;p=kivitendo-erp.git

diff --git a/bin/mozilla/amtemplates.pl b/bin/mozilla/amtemplates.pl
index 9f21e22c7..d32cf790a 100644
--- a/bin/mozilla/amtemplates.pl
+++ b/bin/mozilla/amtemplates.pl
@@ -24,7 +24,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 # administration
@@ -33,6 +34,7 @@
 
 use File::Find;
 
+use SL::DB::Default;
 use SL::AM;
 use SL::Form;
 
@@ -115,6 +117,9 @@ sub display_template_form {
 
   $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|.*/||;
   }
@@ -197,6 +202,7 @@ sub display_template_form {
     #
     if ($format eq "tex") {
       # search all .tex-files in template dir (recursively)
+      my $template_dir = $defaults->templates;
       my @all_files;
       find(
         sub {
@@ -205,13 +211,13 @@ sub display_template_form {
 
           my $fname = $File::Find::name;
           # remove template dir from name
-          $fname =~ s|^$myconfig{templates}/||;
+          $fname =~ s|^\Q$template_dir\E/||;
           # remove .tex from name
           $fname =~ s|.tex$||;
 
           push(@all_files, $fname);
 
-          }, $myconfig{templates});
+          }, $template_dir);
 
       # 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;
@@ -271,10 +277,7 @@ sub display_template_form {
 
     $options{"CAN_EDIT"} = $form->{"edit"};
 
-    if ($form->{edit}) {
-      $::request->{layout}->focus("#edit_content");
-
-    } else {
+    if (!$form->{edit}) {
       $options{"content"}                 = "\n\n" if (!$options{"content"});
       $options{"SHOW_SECOND_EDIT_BUTTON"} = $options{"lines"} > 25;
     }