CustomerVendor-Controller: Daten in Neu-Anzeige bei Fehler beibehalten

[mfinanz.git] / SL / Controller / Admin.pm

diff --git a/SL/Controller/Admin.pm b/SL/Controller/Admin.pm
index 5fdc308fce0081915ace9c3969e1a4d1b52819b1..7a3b1ca74b09969e50d9cf86dfb3f22d57986e92 100644 (file)
--- a/SL/Controller/Admin.pm
+++ b/SL/Controller/Admin.pm
@@ -4,9 +4,10 @@ use strict;
 
 use parent qw(SL::Controller::Base);
 
 
 use parent qw(SL::Controller::Base);
 

-use IO::File;
+use IO::Dir;

 use List::Util qw(first);
 
 use List::Util qw(first);
 

+use SL::Common ();

 use SL::DB::AuthUser;
 use SL::DB::AuthGroup;
 use SL::DB::Printer;
 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
 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);
 );
 
 __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;
   return                   if !$self->authenticate_root;
   return                   if !$self->check_auth_db_and_tables;
   return                   if  $self->apply_dbupgrade_scripts;

+

   $self->redirect_to(action => 'show');
 }
 
   $self->redirect_to(action => 'show');
 }
 


@@ -58,7 +61,7 @@ sub action_apply_dbupgrade_scripts {
   my ($self) = @_;
 
   return if $self->apply_dbupgrade_scripts;
   my ($self) = @_;
 
   return if $self->apply_dbupgrade_scripts;

-  $self->action_show;
+  $self->redirect_to(action => 'show');

 }
 
 sub action_create_auth_db {
 }
 
 sub action_create_auth_db {


@@ -132,6 +135,10 @@ sub action_save_user {
   my $props  = delete($params->{config_values}) || { };
   my $is_new = !$params->{id};
 
   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 } });
   $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 } });


@@ -157,12 +164,31 @@ sub action_save_user {
 sub action_delete_user {
   my ($self) = @_;
 
 sub action_delete_user {
   my ($self) = @_;
 

+  my @clients = @{ $self->user->clients || [] };
+
+  # backup user metadata (email, name, etc)
+  my $user_config_values_ref = $self->user->config_values();
+  my $login =$self->user->login;
+

   if (!$self->user->delete) {
     flash('error', t8('The user could not be deleted.'));
     $self->edit_user_form(title => t8('Edit User'));
     return;
   }
 
   if (!$self->user->delete) {
     flash('error', t8('The user could not be deleted.'));
     $self->edit_user_form(title => t8('Edit User'));
     return;
   }
 

+  # Flag corresponding entries in 'employee' as deleted.
+  # and restore the most important user data in employee
+  # TODO try and catch the whole transaction {user->delete; update employee} {exception}
+  foreach my $client (@clients) {
+    my $dbh = $client->dbconnect(AutoCommit => 1) || next;
+    $dbh->do(qq|UPDATE employee SET deleted = TRUE, name = ?, deleted_email = ?,
+                deleted_tel = ?, deleted_fax = ?, deleted_signature = ? WHERE login = ?|,undef,
+              $user_config_values_ref->{name}, $user_config_values_ref->{email},
+              $user_config_values_ref->{tel}, $user_config_values_ref->{fax},
+              $user_config_values_ref->{signature}, $self->user->login);
+    $dbh->disconnect;
+  }
+

   flash_later('info', t8('The user has been deleted.'));
   $self->redirect_to(action => 'show');
 }
   flash_later('info', t8('The user has been deleted.'));
   $self->redirect_to(action => 'show');
 }


@@ -194,6 +220,10 @@ sub action_save_client {
   my $params = delete($::form->{client}) || { };
   my $is_new = !$params->{id};
 
   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;
   $self->client($is_new ? SL::DB::AuthClient->new : SL::DB::AuthClient->new(id => $params->{id})->load)->assign_attributes(%{ $params });
 
   my @errors = $self->client->validate;


@@ -238,7 +268,7 @@ sub action_test_database_connectivity {
 
   $dbh->disconnect if $dbh;
 
 
   $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);
                 title => t8('Database Connection Test'),
                 ok    => $ok,
                 error => $error);


@@ -266,6 +296,10 @@ sub action_save_group {
   my $params = delete($::form->{group}) || { };
   my $is_new = !$params->{id};
 
   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;
   $self->group($is_new ? SL::DB::AuthGroup->new : SL::DB::AuthGroup->new(id => $params->{id})->load)->assign_attributes(%{ $params });
 
   my @errors = $self->group->validate;


@@ -350,10 +384,87 @@ sub action_delete_printer {
   $self->redirect_to(action => 'list_printers', 'client.id' => $self->client->id);
 }
 
   $self->redirect_to(action => 'list_printers', 'client.id' => $self->client->id);
 }
 

+#
+# actions: database administration
+#
+
+sub action_create_dataset_login {
+  my ($self) = @_;
+
+  $self->database_administration_login_form(
+    title       => t8('Create Dataset'),
+    next_action => 'create_dataset',
+  );
+}
+
+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 => 'show');
+}
+
+sub action_delete_dataset_login {
+  my ($self) = @_;
+
+  $self->database_administration_login_form(
+    title       => t8('Delete Dataset'),
+    next_action => 'delete_dataset',
+  );
+}
+
+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 => 'show');
+}
+

 #
 # actions: locking, unlocking
 #
 
 #
 # actions: locking, unlocking
 #
 

+sub action_show_lock {
+  my ($self) = @_;
+
+  $self->render(
+    "admin/show_lock",
+    title => "kivitendo " . t8('Administration'),
+  );
+}
+

 sub action_unlock_system {
   my ($self) = @_;
 
 sub action_unlock_system {
   my ($self) = @_;
 


@@ -365,7 +476,7 @@ sub action_unlock_system {
 sub action_lock_system {
   my ($self) = @_;
 
 sub action_lock_system {
   my ($self) = @_;
 

-  SL::System::InstallationLock->unlock;
+  SL::System::InstallationLock->lock;

   flash_later('info', t8('Lockfile created!'));
   $self->redirect_to(action => 'show');
 }
   flash_later('info', t8('Lockfile created!'));
   $self->redirect_to(action => 'show');
 }


@@ -385,8 +496,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_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_stylesheets   { [ qw(lx-office-erp.css Mobile.css kivitendo.css) ]                                              }
+sub init_all_numberformats { [ '1,000.00', '1000.00', '1.000,00', '1000,00'   ]                                              }
+sub init_all_stylesheets   { [ qw(lx-office-erp.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)') },
 sub init_all_menustyles    {
   return [
     { id => 'old', title => $::locale->text('Old (on the side)') },


@@ -429,18 +557,21 @@ sub setup_layout {
   my ($self, $action) = @_;
 
   $::request->layout(SL::Layout::Dispatcher->new(style => 'admin'));
   my ($self, $action) = @_;
 
   $::request->layout(SL::Layout::Dispatcher->new(style => 'admin'));

-  $::request->layout->use_stylesheet("lx-office-erp.css");

   $::form->{favicon} = "favicon.ico";
   $::form->{favicon} = "favicon.ico";

+  %::myconfig        = (
+    countrycode      => 'de',
+    numberformat     => '1.000,00',
+    dateformat       => 'dd.mm.yy',
+  ) if !%::myconfig;

 }
 
 sub setup_client {
   my ($self) = @_;
 
 }
 
 sub setup_client {
   my ($self) = @_;
 

-  $self->client((first { $_->is_default } @{ $self->all_clients }) || $self->all_clients->[0]) if !$self->client;
+  $self->client(SL::DB::Manager::AuthClient->get_default || $self->all_clients->[0]) if !$self->client;

   $::auth->set_client($self->client->id);
 }
 
   $::auth->set_client($self->client->id);
 }
 

-

 #
 # displaying forms
 #
 #
 # displaying forms
 #


@@ -454,8 +585,9 @@ sub use_multiselect_js {
 
 sub login_form {
   my ($self, %params) = @_;
 
 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;
+  $::request->layout->no_menu(1);
+  $self->render('admin/adminlogin', title => t8('kivitendo v#1 administration', $version), %params, version => $version);

 }
 
 sub edit_user_form {
 }
 
 sub edit_user_form {


@@ -478,6 +610,30 @@ sub edit_printer_form {
   $self->render('admin/edit_printer', %params);
 }
 
   $self->render('admin/edit_printer', %params);
 }
 

+sub database_administration_login_form {
+  my ($self, %params) = @_;
+
+  $self->render(
+    'admin/dbadmin',
+    dbhost    => $::form->{dbhost}    || $::auth->{DB_config}->{host} || 'localhost',
+    dbport    => $::form->{dbport}    || $::auth->{DB_config}->{port} || 5432,
+    dbuser    => $::form->{dbuser}    || $::auth->{DB_config}->{user} || 'kivitendo',
+    dbpasswd  => $::form->{dbpasswd}  || $::auth->{DB_config}->{password},
+    dbdefault => $::form->{dbdefault} || 'template1',
+    %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
 #
 #
 # helpers
 #