CRM-Menü automatisch einlesen, falls es existiert

Siehe #2328.

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 2212f718edbc264b66c6d008ed5a9e9904fdb0a6..467f56ee8beb61afeb5522cca229b1092e396d7f 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -29,7 +29,7 @@ sub new {
 }
 
 sub init_menu {
 }
 
 sub init_menu {

-  Menu->new('menu.ini');
+  Menu->new('crm/update/menu.ini', 'menu.ini');

 }
 
 sub init_auto_reload_resources_param {
 }
 
 sub init_auto_reload_resources_param {

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 0fb1b1a959851e9d2f5a970627b9ae6fd87232c2..06ea6ee43ed44c04b21459694f7e7ebce836b05b 100644 (file)
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -42,14 +42,19 @@ use strict;
 sub new {
   $main::lxdebug->enter_sub();
 
 sub new {
   $main::lxdebug->enter_sub();
 

-  my ($type, $menufile) = @_;
+  my ($type, @menufiles) = @_;
+  my $self               = bless {}, $type;

 
 

-  my $self    = {};
-  my $inifile = Inifile->new($menufile);
+  my @order;

 
 

-  map { $self->{$_} = $inifile->{$_} } keys %{ $inifile };
+  foreach my $menufile (grep { -f } @menufiles) {
+    my $inifile = Inifile->new($menufile);

 
 

-  bless $self, $type;
+    push @order, @{ delete($inifile->{ORDER}) || [] };
+    $self->{$_} = $inifile->{$_} for keys %{ $inifile };
+  }
+
+  $self->{ORDER} = \@order;

 
   $self->set_access();
 
 
   $self->set_access();