Presenter: Neue Struktur im DBUpgrade

diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm
index 5d0d26c9b572b66908b929b3ddfb9d0081e23099..cd698c5e59b8d9b0c4cbecc3a878233858665bbc 100644 (file)
--- a/SL/DBUpgrade2/Base.pm
+++ b/SL/DBUpgrade2/Base.pm
@@ -12,6 +12,7 @@ use File::Copy ();
 use File::Path ();
 use List::MoreUtils qw(uniq);
 use SL::DBUtils qw(selectfirst_hashref_query);
 use File::Path ();
 use List::MoreUtils qw(uniq);
 use SL::DBUtils qw(selectfirst_hashref_query);

+use SL::Presenter::EscapedText qw(escape);

 use version;
 
 use Rose::Object::MakeMethods::Generic (
 use version;
 
 use Rose::Object::MakeMethods::Generic (


@@ -152,7 +153,7 @@ sub convert_column_to_html {
   foreach my $row (selectall_hashref_query($::form, $self->dbh, qq|SELECT id, $column FROM $table WHERE $column IS NOT NULL|)) {
     next if !$row->{$column} || (($row->{$column} =~ m{^<[a-z]+>}) && ($row->{$column} =~ m{</[a-z]+>$}));
 
   foreach my $row (selectall_hashref_query($::form, $self->dbh, qq|SELECT id, $column FROM $table WHERE $column IS NOT NULL|)) {
     next if !$row->{$column} || (($row->{$column} =~ m{^<[a-z]+>}) && ($row->{$column} =~ m{</[a-z]+>$}));
 

-    my $new_content = "" . $::request->presenter->escape($row->{$column});
+    my $new_content = "" . escape($row->{$column});

     $new_content    =~ s{\r}{}g;
     $new_content    =~ s{\n\n+}{</p><p>}g;
     $new_content    =~ s{\n}{<br />}g;
     $new_content    =~ s{\r}{}g;
     $new_content    =~ s{\n\n+}{</p><p>}g;
     $new_content    =~ s{\n}{<br />}g;

diff --git a/sql/Pg-upgrade2/oe_ar_ap_delivery_orders_edit_notes_as_html.pl b/sql/Pg-upgrade2/oe_ar_ap_delivery_orders_edit_notes_as_html.pl
index 2be82f172d35e3936f8511653cfe45e285ff126f..a5575f6d2eda27a9cec640161907b65747a183f6 100644 (file)
--- a/sql/Pg-upgrade2/oe_ar_ap_delivery_orders_edit_notes_as_html.pl
+++ b/sql/Pg-upgrade2/oe_ar_ap_delivery_orders_edit_notes_as_html.pl
@@ -7,6 +7,7 @@ use strict;
 use utf8;
 
 use SL::DBUtils;
 use utf8;
 
 use SL::DBUtils;

+use SL::Presenter::EscapedText qw(escape);

 
 use parent qw(SL::DBUpgrade2::Base);
 
 
 use parent qw(SL::DBUpgrade2::Base);
 


@@ -18,7 +19,7 @@ sub convert_column {
   foreach my $row (selectall_hashref_query($::form, $self->dbh, qq|SELECT id, $column FROM $table WHERE $column IS NOT NULL|)) {
     next if !$row->{$column} || (($row->{$column} =~ m{^<[a-z]+>}) && ($row->{$column} =~ m{</[a-z]+>$}));
 
   foreach my $row (selectall_hashref_query($::form, $self->dbh, qq|SELECT id, $column FROM $table WHERE $column IS NOT NULL|)) {
     next if !$row->{$column} || (($row->{$column} =~ m{^<[a-z]+>}) && ($row->{$column} =~ m{</[a-z]+>$}));
 

-    my $new_content = "" . $::request->presenter->escape($row->{$column});
+    my $new_content = "" . escape($row->{$column});

     $new_content    =~ s{\r}{}g;
     $new_content    =~ s{\n\n+}{</p><p>}g;
     $new_content    =~ s{\n}{<br />}g;
     $new_content    =~ s{\r}{}g;
     $new_content    =~ s{\n\n+}{</p><p>}g;
     $new_content    =~ s{\n}{<br />}g;