projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31d8e1a
)
Menu: Bei einzelner erp.ini nicht alles umkopieren.
author
Sven Schöling
<s.schoeling@linet-services.de>
Thu, 9 Jul 2015 13:09:19 +0000
(15:09 +0200)
committer
Sven Schöling
<s.schoeling@linet-services.de>
Mon, 20 Jul 2015 14:37:26 +0000
(16:37 +0200)
SL/Menu.pm
patch
|
blob
|
history
diff --git
a/SL/Menu.pm
b/SL/Menu.pm
index
530a468
..
8737016
100644
(file)
--- a/
SL/Menu.pm
+++ b/
SL/Menu.pm
@@
-34,29
+34,28
@@
package Menu;
package Menu;
+use strict;
+
use SL::Auth;
use SL::Inifile;
use SL::Auth;
use SL::Inifile;
-use strict;
+our @ISA = qw(Inifile);
+
sub new {
$main::lxdebug->enter_sub();
sub new {
$main::lxdebug->enter_sub();
- my ($type, @menufiles) = @_;
- my $self = bless {}, $type;
-
- my @order;
+ my ($package, @menufiles) = @_;
- foreach my $menufile (grep { -f } @menufiles) {
- my $inifile = Inifile->new($menufile);
+ my $self = $package->SUPER::new($menufiles[0]);
- push @order, @{ delete($inifile->{ORDER}) || [] };
- $self->{$_} = $inifile->{$_} for keys %{ $inifile };
+ for (@menufiles[1..$#menufiles]) {
+ my $inifile = Inifile->new($_);
+ push @{ $self->{ORDER} }, @{ delete $inifile->{ORDER} };
+ $self->{$_} = $inifile->{$_} for keys %$inifile;
}
}
- $self->{ORDER} = \@order;
-
- $self->set_access();
+ $self->set_access;
$main::lxdebug->leave_sub();
$main::lxdebug->leave_sub();
@@
-68,14
+67,11
@@
sub menuitem_new {
my ($self, $name, $item) = @_;
my ($self, $name, $item) = @_;
- my $form = $main::form;
- my $myconfig = \%main::myconfig;
-
- my $module = $self->{$name}->{module} || $form->{script};
+ my $module = $self->{$name}->{module} || $::form->{script};
my $action = $self->{$name}->{action};
$item->{target} = $self->{$name}->{target} || "main_window";
my $action = $self->{$name}->{action};
$item->{target} = $self->{$name}->{target} || "main_window";
- $item->{href} = $self->{$name}->{href} || "${module}?action=" . $form->escape($action);
+ $item->{href} = $self->{$name}->{href} || "${module}?action=" . $
::
form->escape($action);
my @vars = qw(module target href);
push @vars, 'action' unless ($self->{$name}->{href});
my @vars = qw(module target href);
push @vars, 'action' unless ($self->{$name}->{href});
@@
-85,8
+81,8
@@
sub menuitem_new {
# add other params
foreach my $key (keys %{ $self->{$name} }) {
my ($value, $conf) = split(m/=/, $self->{$name}->{$key}, 2);
# add other params
foreach my $key (keys %{ $self->{$name} }) {
my ($value, $conf) = split(m/=/, $self->{$name}->{$key}, 2);
- $value = $myconfig->{$value} . "/$conf" if ($conf);
- $item->{href} .= "&" . $
form->escape($key) . "=" . $
form->escape($value);
+ $value = $
::
myconfig->{$value} . "/$conf" if ($conf);
+ $item->{href} .= "&" . $
::form->escape($key) . "=" . $::
form->escape($value);
}
$main::lxdebug->leave_sub(LXDebug::DEBUG2());
}
$main::lxdebug->leave_sub(LXDebug::DEBUG2());