X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FLayout%2FBase.pm;h=8e6acfc74df77aad58e15a073ee14228d3921be6;hb=c4a8cd8ca761b16e89fa7ed5616d0e3fd888b82f;hp=ba2db6017b1bb11f69429d17bfbe97b0683a6234;hpb=3dc29e42a53f674d4a5b745663b1f85b54131de2;p=kivitendo-erp.git diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm index ba2db6017..8e6acfc74 100644 --- a/SL/Layout/Base.pm +++ b/SL/Layout/Base.pm @@ -3,6 +3,7 @@ package SL::Layout::Base; use strict; use parent qw(Rose::Object); +use File::Slurp qw(read_file); use List::MoreUtils qw(uniq); use Time::HiRes qw(); @@ -19,6 +20,7 @@ use Rose::Object::MakeMethods::Generic ( use SL::Menu; use SL::Presenter; +use SL::System::Process; my %menu_cache; @@ -38,12 +40,25 @@ sub init_sublayouts_by_name { sub get { $_[0]->sub_layouts; - $_[0]->sub_layouts_by_name->{$_[1]} + return grep { $_ } ($_[0]->sub_layouts_by_name->{$_[1]}); } sub init_auto_reload_resources_param { - return '' unless $::lx_office_conf{debug}->{auto_reload_resources}; - return sprintf('?rand=%d-%d-%d', Time::HiRes::gettimeofday(), int(rand 1000000000000)); + return sprintf('?rand=%d-%d-%d', Time::HiRes::gettimeofday(), int(rand 1000000000000)) if $::lx_office_conf{debug}->{auto_reload_resources}; + + my $git_dir = SL::System::Process::exe_dir() . '/.git'; + + return '' unless -d $git_dir; + + my $content = eval { scalar(read_file($git_dir . '/HEAD')) }; + + return '' unless ($content // '') =~ m{\Aref: ([^\r\n]+)}; + + $content = eval { scalar(read_file($git_dir . '/' . $1)) }; + + return '' unless ($content // '') =~ m{\A([0-9a-fA-F]+)}; + + return '?rand=' . $1; } ##########################################