backend/server/rhnUser.py | 2 +- java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml | 1 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 6 ++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 6 ++++++ java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6 ++++++ java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 7 files changed, 24 insertions(+), 4 deletions(-)
New commits: commit 639f4534cdbfcc8167b9e2a0e38766a8ed36a7f5 Author: Miroslav Suchý msuchy@redhat.com Date: Mon Oct 3 11:39:16 2011 +0200
Automatic commit of package [spacewalk-java] release [1.6.54-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 6dc1fd8..a3358a5 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -17,7 +17,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.6.53 +Version: 1.6.54 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -557,6 +557,9 @@ fi %{jardir}/postgresql-jdbc.jar
%changelog +* Mon Oct 03 2011 Miroslav Suchý 1.6.54-1 +- 229836 - allow empty prefix for user + * Sun Oct 02 2011 Jan Pazdziora 1.6.53-1 - Removing unused imports.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 22c8268..ac76a10 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.6.53-1 java/ +1.6.54-1 java/
commit e8e83e3190072ca434bc02fae06d04db84b54f0d Author: Miroslav Suchý msuchy@redhat.com Date: Fri Sep 30 14:52:00 2011 +0200
229836 - allow empty prefix for user
Having to basically guess either Mr. or Ms. and sometimes getting that wrong offends some people and embarrasses others and the field doesn't really seem very important to begin with.
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py index 3b48a89..c946201 100644 --- a/backend/server/rhnUser.py +++ b/backend/server/rhnUser.py @@ -174,7 +174,7 @@ class User: self.info[name] = value[:128] changed = 1 elif name == "prefix": - values = ["Mr.", "Mrs.", "Ms.", "Dr.", "Hr.", "Sr."] + values = ["Mr.", "Mrs.", "Ms.", "Dr.", "Hr.", "Sr.", " "] # Now populate a dictinary of valid values valids = UserDictCase() for v in values: # initialize from good values, with and w/o the dot diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml index 324dc8d..ec00fc1 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/util_queries.xml @@ -5,7 +5,6 @@ SELECT text as prefix FROM web_user_prefix WHERE text != '.' - AND text != ' ' ORDER BY text </query> </mode> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index f676061..e9be614 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -1059,6 +1059,12 @@ <context context-type="sourcefile">/rhn/users/CreateUser</context> </context-group> <target>সেনর</target></trans-unit> + <trans-unit id="user prefix "> +<source> </source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/CreateUser</context> + </context-group> + <target> </target></trans-unit>
<trans-unit id="user.delete"> <source>Deleted user <strong>{0}</strong>.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index d19e257..6ac2f57 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -1059,6 +1059,12 @@ <context context-type="sourcefile">/rhn/users/CreateUser</context> </context-group> <target>-</target></trans-unit> + <trans-unit id="user prefix "> +<source> </source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/CreateUser</context> + </context-group> + <target> </target></trans-unit>
<trans-unit id="user.delete"> <source>Deleted user <strong>{0}</strong>.</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml index bf7c206..f38e0e6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml @@ -1071,6 +1071,12 @@ http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" <context context-type="sourcefile">/rhn/users/CreateUser</context> </context-group> </trans-unit> + <trans-unit id="user prefix "> +<source> </source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/users/CreateUser</context> + </context-group> + </trans-unit>
<trans-unit id="user.delete"> <source>Deleted user <strong>{0}</strong>.</source>
spacewalk-commits@lists.fedorahosted.org