projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8572337
)
Admin: Zuordnungen User <-> Gruppen <-> Mandanten auch leeren können
author
Moritz Bunkus
<m.bunkus@linet-services.de>
Fri, 5 Jul 2013 12:41:08 +0000
(14:41 +0200)
committer
Moritz Bunkus
<m.bunkus@linet-services.de>
Fri, 5 Jul 2013 12:41:08 +0000
(14:41 +0200)
SL/Controller/Admin.pm
patch
|
blob
|
history
diff --git
a/SL/Controller/Admin.pm
b/SL/Controller/Admin.pm
index
fe7dac5
..
bcc9436
100644
(file)
--- a/
SL/Controller/Admin.pm
+++ b/
SL/Controller/Admin.pm
@@
-135,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 } });
@@
-206,6
+210,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;
@@
-278,6
+286,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;