X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FAdmin.pm;h=bcc9436b744a7692d2c0d281e9c9d2078e17ee47;hb=eff6af2885966e0bbe4b614ef03525012cff92aa;hp=5555baa20624d0d630eb0ec66725c2d88e10fec3;hpb=516cd9bbdb6b8e40da93925965b92710f1a97bfc;p=kivitendo-erp.git diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm index 5555baa20..bcc9436b7 100644 --- a/SL/Controller/Admin.pm +++ b/SL/Controller/Admin.pm @@ -4,9 +4,10 @@ use strict; use parent qw(SL::Controller::Base); -use IO::File; +use IO::Dir; use List::Util qw(first); +use SL::Common (); use SL::DB::AuthUser; use SL::DB::AuthGroup; use SL::DB::Printer; @@ -18,7 +19,8 @@ use SL::User; use Rose::Object::MakeMethods::Generic ( 'scalar --get_set_init' => [ qw(client user group printer db_cfg is_locked - all_dateformats all_numberformats all_countrycodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers) ], + all_dateformats all_numberformats all_countrycodes all_stylesheets all_menustyles all_clients all_groups all_users all_rights all_printers + all_dbsources all_used_dbsources all_accounting_methods all_inventory_systems all_profit_determinations all_charts) ], ); __PACKAGE__->run_before(\&setup_layout); @@ -41,6 +43,7 @@ sub action_login { return if !$self->authenticate_root; return if !$self->check_auth_db_and_tables; return if $self->apply_dbupgrade_scripts; + $self->redirect_to(action => 'show'); } @@ -132,6 +135,10 @@ sub action_save_user { my $props = delete($params->{config_values}) || { }; my $is_new = !$params->{id}; + # Assign empty arrays if the browser doesn't send those controls. + $params->{clients} ||= []; + $params->{groups} ||= []; + $self->user($is_new ? SL::DB::AuthUser->new : SL::DB::AuthUser->new(id => $params->{id})->load) ->assign_attributes(%{ $params }) ->config_values({ %{ $self->user->config_values }, %{ $props } }); @@ -203,6 +210,10 @@ sub action_save_client { my $params = delete($::form->{client}) || { }; my $is_new = !$params->{id}; + # Assign empty arrays if the browser doesn't send those controls. + $params->{groups} ||= []; + $params->{users} ||= []; + $self->client($is_new ? SL::DB::AuthClient->new : SL::DB::AuthClient->new(id => $params->{id})->load)->assign_attributes(%{ $params }); my @errors = $self->client->validate; @@ -247,7 +258,7 @@ sub action_test_database_connectivity { $dbh->disconnect if $dbh; - $self->render('admin/test_db_connection', + $self->render('admin/test_db_connection', { layout => 0 }, title => t8('Database Connection Test'), ok => $ok, error => $error); @@ -275,6 +286,10 @@ sub action_save_group { my $params = delete($::form->{group}) || { }; my $is_new = !$params->{id}; + # Assign empty arrays if the browser doesn't send those controls. + $params->{clients} ||= []; + $params->{users} ||= []; + $self->group($is_new ? SL::DB::AuthGroup->new : SL::DB::AuthGroup->new(id => $params->{id})->load)->assign_attributes(%{ $params }); my @errors = $self->group->validate; @@ -359,6 +374,68 @@ sub action_delete_printer { $self->redirect_to(action => 'list_printers', 'client.id' => $self->client->id); } +# +# actions: database administration +# + +sub action_database_administration { + my ($self) = @_; + + $::form->{dbhost} ||= $::auth->{DB_config}->{host} || 'localhost'; + $::form->{dbport} ||= $::auth->{DB_config}->{port} || 5432; + $::form->{dbuser} ||= $::auth->{DB_config}->{user} || 'kivitendo'; + $::form->{dbpasswd} ||= $::auth->{DB_config}->{password}; + $::form->{dbdefault} ||= 'template1'; + + $self->render('admin/dbadmin', title => t8('Database Administration')); +} + +sub action_create_dataset { + my ($self) = @_; + $self->create_dataset_form; +} + +sub action_do_create_dataset { + my ($self) = @_; + + my @errors; + push @errors, t8("Dataset missing!") if !$::form->{db}; + push @errors, t8("Default currency missing!") if !$::form->{defaultcurrency}; + + if (@errors) { + flash('error', @errors); + return $self->create_dataset_form; + } + + $::form->{encoding} = 'UNICODE'; + User->new->dbcreate($::form); + + flash_later('info', t8("The dataset #1 has been created.", $::form->{db})); + $self->redirect_to(action => 'database_administration'); +} + +sub action_delete_dataset { + my ($self) = @_; + $self->delete_dataset_form; +} + +sub action_do_delete_dataset { + my ($self) = @_; + + my @errors; + push @errors, t8("Dataset missing!") if !$::form->{db}; + + if (@errors) { + flash('error', @errors); + return $self->create_dataset_form; + } + + User->new->dbdelete($::form); + + flash_later('info', t8("The dataset #1 has been deleted.", $::form->{db})); + $self->redirect_to(action => 'database_administration'); +} + # # actions: locking, unlocking # @@ -394,8 +471,25 @@ sub init_all_users { SL::DB::Manager::AuthUser ->get_all_sorted sub init_all_groups { SL::DB::Manager::AuthGroup ->get_all_sorted } sub init_all_printers { SL::DB::Manager::Printer ->get_all_sorted } sub init_all_dateformats { [ qw(mm/dd/yy dd/mm/yy dd.mm.yy yyyy-mm-dd) ] } -sub init_all_numberformats { [ qw(1,000.00 1000.00 1.000,00 1000,00) ] } +sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,00' ] } sub init_all_stylesheets { [ qw(lx-office-erp.css Mobile.css kivitendo.css) ] } +sub init_all_dbsources { [ sort User->dbsources($::form) ] } +sub init_all_used_dbsources { { map { (join(':', $_->dbhost || 'localhost', $_->dbport || 5432, $_->dbname) => $_->name) } @{ $_[0]->all_clients } } } +sub init_all_accounting_methods { [ { id => 'accrual', name => t8('Accrual accounting') }, { id => 'cash', name => t8('Cash accounting') } ] } +sub init_all_inventory_systems { [ { id => 'perpetual', name => t8('Perpetual inventory') }, { id => 'periodic', name => t8('Periodic inventory') } ] } +sub init_all_profit_determinations { [ { id => 'balance', name => t8('Balancing') }, { id => 'income', name => t8('Cash basis accounting') } ] } + +sub init_all_charts { + tie my %dir_h, 'IO::Dir', 'sql/'; + + return [ + map { s/-chart\.sql$//; +{ id => $_ } } + sort + grep { /-chart\.sql\z/ && !/Default-chart.sql\z/ } + keys %dir_h + ]; +} + sub init_all_menustyles { return [ { id => 'old', title => $::locale->text('Old (on the side)') }, @@ -440,6 +534,11 @@ sub setup_layout { $::request->layout(SL::Layout::Dispatcher->new(style => 'admin')); $::request->layout->use_stylesheet("lx-office-erp.css"); $::form->{favicon} = "favicon.ico"; + %::myconfig = ( + countrycode => 'de', + numberformat => '1.000,00', + dateformat => 'dd.mm.yy', + ) if !%::myconfig; } sub setup_client { @@ -463,8 +562,8 @@ sub use_multiselect_js { sub login_form { my ($self, %params) = @_; - $::request->layout->focus('#admin_password'); - $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $::form->read_version), %params); + my $version = $::form->read_version; + $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version); } sub edit_user_form { @@ -487,6 +586,16 @@ sub edit_printer_form { $self->render('admin/edit_printer', %params); } +sub create_dataset_form { + my ($self, %params) = @_; + $self->render('admin/create_dataset', title => (t8('Database Administration') . " / " . t8('Create Dataset'))); +} + +sub delete_dataset_form { + my ($self, %params) = @_; + $self->render('admin/delete_dataset', title => (t8('Database Administration') . " / " . t8('Delete Dataset'))); +} + # # helpers #