From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 2 Oct 2017 10:09:29 +0000 (+0200)
Subject: $::form->read_version auf SL::Version->get_version umgestellt
X-Git-Tag: release-3.5.4~590
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=4a3959958abe815dc130e2e4e554c26e331475bd;p=kivitendo-erp.git

$::form->read_version auf SL::Version->get_version umgestellt
---

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index 9937c5bab..5323632a5 100644
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -17,6 +17,7 @@ use SL::Helper::Flash;
 use SL::Locale::String qw(t8);
 use SL::System::InstallationLock;
 use SL::User;
+use SL::Version;
 use SL::Layout::AdminLogin;
 
 use Rose::Object::MakeMethods::Generic
@@ -595,8 +596,8 @@ sub use_multiselect_js {
 sub login_form {
   my ($self, %params) = @_;
   $::request->layout(SL::Layout::AdminLogin->new);
-  my $version         = $::form->read_version;
-  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
+  my $version         = SL::Version->get_version;
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version, logo_url => $::form->read_logo );
 }
 
 sub edit_user_form {
diff --git a/SL/Controller/LoginScreen.pm b/SL/Controller/LoginScreen.pm
index 1590e614d..138782525 100644
--- a/SL/Controller/LoginScreen.pm
+++ b/SL/Controller/LoginScreen.pm
@@ -13,6 +13,7 @@ use SL::DB::AuthUser;
 use SL::DB::Employee;
 use SL::Locale::String qw(t8);
 use SL::User;
+use SL::Version;
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => [ qw(clients default_client_id) ],
@@ -178,7 +179,7 @@ sub init_default_client_id {
 sub show_login_form {
   my ($self, %params) = @_;
 
-  $self->render('login_screen/user_login', %params, version => $::form->read_version);
+  $self->render('login_screen/user_login', %params, version => SL::Version->get_version, logo_url => $::form->read_logo );
 }
 
 1;
diff --git a/SL/GoBD.pm b/SL/GoBD.pm
index 50d56a966..9c95a0ae3 100644
--- a/SL/GoBD.pm
+++ b/SL/GoBD.pm
@@ -19,6 +19,7 @@ use List::UtilsBy qw(partition_by sort_by);
 use SL::DB::Helper::ALL; # since we work on meta data, we need everything
 use SL::DB::Helper::Mappings;
 use SL::Locale::String qw(t8);
+use SL::Version;
 
 use Rose::Object::MakeMethods::Generic (
   scalar                  => [ qw(from to writer company location) ],
@@ -579,7 +580,7 @@ sub tag {
 
 sub make_comment {
   my $gobd_version  = API_VERSION();
-  my $kivi_version  = $::form->read_version;
+  my $kivi_version  = SL::Version->get_version;
   my $person        = $::myconfig{name};
   my $contact       = join ', ',
     (t8("Email") . ": $::myconfig{email}" ) x!! $::myconfig{email},