Merge pull request #63 from jsuchome/changing_cn

- enable changing of cn value if LDAP user is not saved yet
yast · Nov 20, 2014 · 1208a14 · 1208a14
2 parents c7a669d + 875b5f9
commit 1208a14
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 20 09:26:20 CET 2014 - jsuchome@suse.cz
+
+- enable changing of cn value if LDAP user is not saved yet
+  (bnc#904645)
+- 3.1.35
+
 -------------------------------------------------------------------
 Thu Oct 16 12:31:21 CEST 2014 - jsuchome@suse.cz
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.1.34
+Version:        3.1.35
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/include/users/dialogs.rb b/src/include/users/dialogs.rb
@@ -1145,7 +1145,8 @@ def EditUserDialog(what)
                 givenname = ""
               end
             end
-            if cn == "" &&
+            # enable changing of cn value only if LDAP user is not saved yet (bnc#904645)
+            if (cn == "" || action == "added") &&
                 # no substitution when editing: TODO bug 238282
                 (what == "edit_user" ||
                   !# cn should not be substitued: