projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
L./P.select_tag: 'default' auf Liste von Rose::DB::Object-Instanzen setzen können...
[kivitendo-erp.git]
/
SL
/
Layout
/
Javascript.pm
diff --git
a/SL/Layout/Javascript.pm
b/SL/Layout/Javascript.pm
index
f3a2f0f
..
b08cf6d
100644
(file)
--- a/
SL/Layout/Javascript.pm
+++ b/
SL/Layout/Javascript.pm
@@
-47,7
+47,7
@@
sub display {
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
$callback = URI->new($callback)->rel($callback) if $callback;
$callback = "login.pl?action=company_logo" if $callback =~ /^(\.\/)?$/;
- $self->
render("menu/menunew", { partial => 1, no_output => 1 }
,
+ $self->
presenter->render("menu/menunew"
,
force_ul_width => 1,
date => $self->clock_line,
menu_items => $self->acc_menu,
force_ul_width => 1,
date => $self->clock_line,
menu_items => $self->acc_menu,
@@
-110,10
+110,13
@@
sub create_menu {
my $form = $main::form;
my %myconfig = %main::myconfig;
my $form = $main::form;
my %myconfig = %main::myconfig;
+ $depth ||= 0;
+
die if ($depth * 1 > 5);
my @menuorder = $menu->access_control(\%myconfig, $parent);
$parent .= "--" if ($parent);
die if ($depth * 1 > 5);
my @menuorder = $menu->access_control(\%myconfig, $parent);
$parent .= "--" if ($parent);
+ $parent ||= '';
foreach my $name (@menuorder) {
substr($name, 0, length($parent), "");
foreach my $name (@menuorder) {
substr($name, 0, length($parent), "");