Merge branch 'master' of github.com:kivitendo/kivitendo-erp

[mfinanz.git] / SL / Controller / RequirementSpecPredefinedText.pm

diff --git a/SL/Controller/RequirementSpecPredefinedText.pm b/SL/Controller/RequirementSpecPredefinedText.pm
index 24d6f9110f458c09b813a734278d7bc250777986..959a770f8c26c5dd4c8beeb9b9891873a1fa0ac9 100644 (file)
--- a/SL/Controller/RequirementSpecPredefinedText.pm
+++ b/SL/Controller/RequirementSpecPredefinedText.pm
@@ -5,7 +5,6 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use SL::DB::RequirementSpecPredefinedText;
-use SL::DB::Language;
 use SL::Helper::Flash;
 use SL::Locale::String;
 
@@ -15,6 +14,7 @@ use Rose::Object::MakeMethods::Generic
 );
 
 __PACKAGE__->run_before('check_auth');
+__PACKAGE__->run_before('setup');
 __PACKAGE__->run_before('load_requirement_spec_predefined_text', only => [ qw(edit update destroy) ]);
 
 #
@@ -25,7 +25,7 @@ sub action_list {
   my ($self) = @_;
 
   $self->render('requirement_spec_predefined_text/list',
-                title                             => t8('Predefined Texts'),
+                title                             => t8('Pre-defined Texts'),
                 REQUIREMENT_SPEC_PREDEFINED_TEXTS => SL::DB::Manager::RequirementSpecPredefinedText->get_all_sorted);
 }
 
@@ -70,7 +70,7 @@ sub action_reorder {
 
   SL::DB::RequirementSpecPredefinedText->reorder_list(@{ $::form->{requirement_spec_predefined_text_id} || [] });
 
-  $self->render('1;', { type => 'js', inline => 1 });
+  $self->render(\'', { type => 'json' });
 }
 
 #
@@ -81,6 +81,10 @@ sub check_auth {
   $::auth->assert('config');
 }
 
+sub setup {
+  $::request->layout->use_javascript("${_}.js")  for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+}
+
 #
 # helpers
 #