Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4a395995

Von Sven Schöling vor etwa 7 Jahren hinzugefügt

  • ID 4a3959958abe815dc130e2e4e554c26e331475bd
  • Vorgänger 6627c9eb
  • Nachfolger d90b14b1

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

Unterschiede anzeigen:

SL/Controller/Admin.pm
17 17
use SL::Locale::String qw(t8);
18 18
use SL::System::InstallationLock;
19 19
use SL::User;
20
use SL::Version;
20 21
use SL::Layout::AdminLogin;
21 22

  
22 23
use Rose::Object::MakeMethods::Generic
......
595 596
sub login_form {
596 597
  my ($self, %params) = @_;
597 598
  $::request->layout(SL::Layout::AdminLogin->new);
598
  my $version         = $::form->read_version;
599
  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);
599
  my $version         = SL::Version->get_version;
600
  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version, logo_url => $::form->read_logo );
600 601
}
601 602

  
602 603
sub edit_user_form {
SL/Controller/LoginScreen.pm
13 13
use SL::DB::Employee;
14 14
use SL::Locale::String qw(t8);
15 15
use SL::User;
16
use SL::Version;
16 17

  
17 18
use Rose::Object::MakeMethods::Generic (
18 19
  'scalar --get_set_init' => [ qw(clients default_client_id) ],
......
178 179
sub show_login_form {
179 180
  my ($self, %params) = @_;
180 181

  
181
  $self->render('login_screen/user_login', %params, version => $::form->read_version);
182
  $self->render('login_screen/user_login', %params, version => SL::Version->get_version, logo_url => $::form->read_logo );
182 183
}
183 184

  
184 185
1;
SL/GoBD.pm
19 19
use SL::DB::Helper::ALL; # since we work on meta data, we need everything
20 20
use SL::DB::Helper::Mappings;
21 21
use SL::Locale::String qw(t8);
22
use SL::Version;
22 23

  
23 24
use Rose::Object::MakeMethods::Generic (
24 25
  scalar                  => [ qw(from to writer company location) ],
......
579 580

  
580 581
sub make_comment {
581 582
  my $gobd_version  = API_VERSION();
582
  my $kivi_version  = $::form->read_version;
583
  my $kivi_version  = SL::Version->get_version;
583 584
  my $person        = $::myconfig{name};
584 585
  my $contact       = join ', ',
585 586
    (t8("Email") . ": $::myconfig{email}" ) x!! $::myconfig{email},

Auch abrufbar als: Unified diff