Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scabrero/users fix empty displayname #1111

Merged
merged 5 commits into from Mar 12, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions main/users/src/EBox/Users.pm
Expand Up @@ -420,13 +420,13 @@ sub _migrateTo34
my $users = $self->users(1); my $users = $self->users(1);
foreach my $user (@{$users}) { foreach my $user (@{$users}) {
unless ($user->displayname()) { unless ($user->displayname()) {
$user->set('displayname', $user->fullname()); $user->set('displayName', $user->fullname());
} }
} }


foreach my $contact (@{$self->contacts()}) { foreach my $contact (@{$self->contacts()}) {
unless ($contact->displayname()) { unless ($contact->displayname()) {
$contact->set('displayname', $contact->fullname()); $contact->set('displayName', $contact->fullname());
} }
} }
} }
Expand Down
4 changes: 2 additions & 2 deletions main/users/src/EBox/Users/CGI/EditContact.pm
Expand Up @@ -80,9 +80,9 @@ sub _process
} }
my $displayname = $self->unsafeParam('displayname'); my $displayname = $self->unsafeParam('displayname');
if (length ($displayname)) { if (length ($displayname)) {
$contact->set('displayname', $displayname, 1); $contact->set('displayName', $displayname, 1);
} else { } else {
$contact->delete('displayname', 1); $contact->delete('displayName', 1);
} }
my $description = $self->unsafeParam('description'); my $description = $self->unsafeParam('description');
if (length ($description)) { if (length ($description)) {
Expand Down
4 changes: 2 additions & 2 deletions main/users/src/EBox/Users/CGI/EditUser.pm
Expand Up @@ -84,10 +84,10 @@ sub _process


my $displayname = $self->unsafeParam('displayname'); my $displayname = $self->unsafeParam('displayname');
if (length ($displayname)) { if (length ($displayname)) {
$user->set('displayname', $displayname, 1); $user->set('displayName', $displayname, 1);
$setText = $user->name() . " ($displayname)"; $setText = $user->name() . " ($displayname)";
} else { } else {
$user->delete('displayname', 1); $user->delete('displayName', 1);
$setText = $user->name(); $setText = $user->name();
} }
my $description = $self->unsafeParam('description'); my $description = $self->unsafeParam('description');
Expand Down
2 changes: 1 addition & 1 deletion main/users/src/templates/edituser.mas
Expand Up @@ -45,7 +45,7 @@ my $iconClass = $user->isDisabled() ? 'icon-duser' : 'icon-user';


<& masterSlaveUserAttr, <& masterSlaveUserAttr,
name => 'displayname', name => 'displayname',
value=> $user->displayname(), value=> ($user->displayname() or ''),
slave => $slave, slave => $slave,
&> &>
</div> </div>
Expand Down