projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
SL
/
Controller
/
Base.pm
diff --git
a/SL/Controller/Base.pm
b/SL/Controller/Base.pm
index
6d94347
..
ac09057
100644
(file)
--- a/
SL/Controller/Base.pm
+++ b/
SL/Controller/Base.pm
@@
-7,6
+7,8
@@
use parent qw(Rose::Object);
use Carp;
use IO::File;
use List::Util qw(first);
use Carp;
use IO::File;
use List::Util qw(first);
+use SL::Request qw(flatten);
+use SL::MoreCommon qw(uri_encode);
#
# public/helper functions
#
# public/helper functions
@@
-21,7
+23,7
@@
sub url_for {
my $controller = delete($params{controller}) || $self->_controller_name;
my $action = delete($params{action}) || 'dispatch';
$params{action} = "${controller}/${action}";
my $controller = delete($params{controller}) || $self->_controller_name;
my $action = delete($params{action}) || 'dispatch';
$params{action} = "${controller}/${action}";
- my $query = join
('&', map { $::form->escape($_) . '=' . $::form->escape($params{$_}) } keys %params)
;
+ my $query = join
'&', map { uri_encode($_->[0]) . '=' . uri_encode($_->[1]) } @{ flatten(\%params) }
;
return "controller.pl?${query}";
}
return "controller.pl?${query}";
}
@@
-30,6
+32,11
@@
sub redirect_to {
my $self = shift;
my $url = $self->url_for(@_);
my $self = shift;
my $url = $self->url_for(@_);
+ if ($self->delay_flash_on_redirect) {
+ require SL::Helper::Flash;
+ SL::Helper::Flash::delay_flash();
+ }
+
print $::request->{cgi}->redirect($url);
}
print $::request->{cgi}->redirect($url);
}
@@
-152,6
+159,14
@@
sub _run_hooks {
}
}
}
}
+#
+# behaviour. override these
+#
+
+sub delay_flash_on_redirect {
+ 0;
+}
+
#
# private functions -- for use in Base only
#
#
# private functions -- for use in Base only
#
@@
-482,6
+497,12
@@
action.
The hook's return values are discarded.
The hook's return values are discarded.
+=item delay_flash_on_redirect
+
+May be overridden by a controller. If this method returns true, redirect_to
+will delay all flash messages for the current request. Defaults to false for
+compatibility reasons.
+
=back
=head2 PRIVATE FUNCTIONS
=back
=head2 PRIVATE FUNCTIONS