projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Form::parse_amount: Parsen als Oktalzahlen verhindern
[kivitendo-erp.git]
/
SL
/
Menu.pm
diff --git
a/SL/Menu.pm
b/SL/Menu.pm
index
06ea6ee
..
530a468
100644
(file)
--- a/
SL/Menu.pm
+++ b/
SL/Menu.pm
@@
-147,7
+147,7
@@
sub parse_access_string {
push @{$cur_ary}, $token;
} else {
push @{$cur_ary}, $token;
} else {
- push @{$cur_ary}, $auth->check_right($
form->
{login}, $token, 1);
+ push @{$cur_ary}, $auth->check_right($
::myconfig
{login}, $token, 1);
}
}
}
}
@@
-162,6
+162,11
@@
sub parse_access_string {
return SL::Auth::evaluate_rights_ary($stack[0]);
}
return SL::Auth::evaluate_rights_ary($stack[0]);
}
+sub parse_instance_conf_string {
+ my ($self, $setting) = @_;
+ return $::instance_conf->data->{$setting};
+}
+
sub set_access {
my $self = shift;
sub set_access {
my $self = shift;
@@
-171,6
+176,7
@@
sub set_access {
my $entry = $self->{$key};
$entry->{GRANTED} = $entry->{ACCESS} ? $self->parse_access_string($key, $entry->{ACCESS}) : 1;
my $entry = $self->{$key};
$entry->{GRANTED} = $entry->{ACCESS} ? $self->parse_access_string($key, $entry->{ACCESS}) : 1;
+ $entry->{GRANTED} &&= $self->parse_instance_conf_string($entry->{INSTANCE_CONF}) if $entry->{INSTANCE_CONF};
$entry->{IS_MENU} = $entry->{submenu} || ($key !~ m/--/);
$entry->{NUM_VISIBLE_CHILDREN} = 0;
$entry->{IS_MENU} = $entry->{submenu} || ($key !~ m/--/);
$entry->{NUM_VISIBLE_CHILDREN} = 0;