Brieffunktion: Verwendung von HTML im Body

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 5e07bd0f822fb48f67aa8fb21458bfae7ed38644..2af59b07d84ebdbf36f86366e98f55d7751d9355 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -221,6 +221,9 @@ sub action_print_letter {
     template  => $template_file,
     variables => $::form,
     return    => 'file_name',
+    variable_content_types => {
+      body                 => 'html',
+    },
   );
 
   my $pdf_file_name;
@@ -306,6 +309,8 @@ sub action_delete_drafts {
 sub _display {
   my ($self, %params) = @_;
 
+  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+
   my $letter = $self->letter;
 
  $params{title} ||= t8('Edit Letter');

diff --git a/SL/DB/Letter.pm b/SL/DB/Letter.pm
index a7deeaeeb83d8545c2b097f60b9fbfa1465d212b..02b54cde88d65b37f117594955edd3950c5d7734 100644 (file)
--- a/SL/DB/Letter.pm
+++ b/SL/DB/Letter.pm
@@ -1,10 +1,8 @@
-# This file has been auto-generated only because it didn't exist.
-# Feel free to modify it at will; it will not be overwritten automatically.
-
 package SL::DB::Letter;
 
 use strict;
 
+use SL::DB::Helper::AttrHTML;
 use SL::DB::MetaSetup::Letter;
 use SL::DB::Manager::Letter;
 
@@ -19,6 +17,8 @@ __PACKAGE__->meta->add_relationships(
 
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->attr_html('body');
+
 sub new_from_draft {
   my ($class, $draft) = @_;
 

diff --git a/SL/DB/LetterDraft.pm b/SL/DB/LetterDraft.pm
index 109010e8f6f08b88dac949463d66dccd79894373..089755bc82508453fec5f7e156283c79eadef073 100644 (file)
--- a/SL/DB/LetterDraft.pm
+++ b/SL/DB/LetterDraft.pm
@@ -1,14 +1,14 @@
-# This file has been auto-generated only because it didn't exist.
-# Feel free to modify it at will; it will not be overwritten automatically.
-
 package SL::DB::LetterDraft;
 
 use strict;
 
+use SL::DB::Helper::AttrHTML;
 use SL::DB::MetaSetup::LetterDraft;
 
 __PACKAGE__->meta->initialize;
 
+__PACKAGE__->attr_html('body');
+
 # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
 __PACKAGE__->meta->make_manager_class;
 

diff --git a/sql/Pg-upgrade2/use_html_in_letter.pl b/sql/Pg-upgrade2/use_html_in_letter.pl
new file mode 100644 (file)
index 0000000..7f42cc0
--- /dev/null
+++ b/sql/Pg-upgrade2/use_html_in_letter.pl
@@ -0,0 +1,21 @@
+# @tag: use_html_in_letter
+# @description: Briefe: HTML für Body nutzen können
+# @depends: letter letter_draft
+package SL::DBUpgrade2::use_html_in_letter;
+
+use strict;
+use utf8;
+
+use SL::DBUtils;
+
+use parent qw(SL::DBUpgrade2::Base);
+
+sub run {
+  my ($self) = @_;
+
+  $self->convert_column_to_html($_, 'body') for qw(letter letter_draft);
+
+  return 1;
+}
+
+1;

diff --git a/templates/webpages/letter/edit.html b/templates/webpages/letter/edit.html
index 1e84de8089e911de8164ebba5688c7974988e033..a43f310af68d0bc537f3bbbec7e5dfe4590b3fc2 100644 (file)
--- a/templates/webpages/letter/edit.html
+++ b/templates/webpages/letter/edit.html
@@ -69,7 +69,7 @@
     <tr>
     <tr>
      <th align=right>[% 'Body' | $T8 %]</th>
-     <td><textarea name='letter.body' style='width:100%' rows=20>[% letter.body | html %]</textarea></td>
+     <td>[% L.textarea_tag('letter.body_as_restricted_html', letter.body_as_restricted_html, style='width:100%', rows=20, class="texteditor") %]</td>
     </tr>
     <tr height=10></tr>
      <th align=right>[% 'Internal Notes' | $T8 %]</th>