java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java | 3 ++- java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-)
New commits: commit 12ee8d60a358cd3f435fdb88c61227e3d61f6b6e Author: Johannes Renner jrenner@suse.de Date: Tue Nov 20 13:35:04 2012 +0100
Fix errors with unrequired field 'Prefix'
diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java index e7726ad..3056834 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java @@ -67,7 +67,8 @@ public abstract class UserEditActionHelper extends RhnAction { targetUser.setFirstNames((String)form.get("firstNames")); targetUser.setLastName((String)form.get("lastName")); targetUser.setTitle((String)form.get("title")); - targetUser.setPrefix((String)form.get("prefix")); + String prefix = (String)form.get("prefix"); + targetUser.setPrefix(prefix.isEmpty() ? " " : prefix); // Update PAM Authentication attribute updatePamAttribute(loggedInUser, targetUser, form); } diff --git a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java index fa16d7c..c0097a0 100644 --- a/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java +++ b/java/code/src/com/redhat/rhn/manager/user/CreateUserCommand.java @@ -224,12 +224,16 @@ public class CreateUserCommand { * errors list. */ private void validatePrefix() { - if (user.getPrefix() != null) { + String prefix = user.getPrefix(); + if (prefix != null) { // Make sure whether prefix is valid, if it is set SortedSet validPrefixes = LocalizationService.getInstance().availablePrefixes(); + if (prefix.isEmpty()) { + user.setPrefix(" "); + } if (!validPrefixes.contains(user.getPrefix())) { errors.add(new ValidatorError("error.user_invalid_prefix", - user.getPrefix(), validPrefixes.toString())); + prefix, validPrefixes.toString())); } } }
spacewalk-commits@lists.fedorahosted.org