Include multi-value fields on the Add Person page

Remove multi-valued cn from groups

1 files changed, 5 insertions, 9 deletions

diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
index 0df2d3c8..e9763bac 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
@@ -90,9 +90,11 @@ class GroupController(IPAController):
         #       on any error, we redirect to the _edit_ group page.
         #       this code does data setup, similar to groupedit()
         #
-        if isinstance(kw['cn'], str):
-            kw['cn'] = [kw['cn']]
-        group = client.get_entry_by_cn(kw['cn'][0], group_fields)
+        if isinstance(kw['cn'], list):
+            cn0 = kw['cn'][0]
+        else:
+            cn0 = kw['cn']
+        group = client.get_entry_by_cn(cn0, group_fields)
         group_dict = group.toDict()
         member_dicts = []
 
@@ -220,12 +222,6 @@ class GroupController(IPAController):
         self.restrict_post()
         client = self.get_ipaclient()
 
-        # Fix incoming multi-valued form fields
-        kw['cn'] = []
-        for i in range(len(kw['cns'])):
-            kw['cn'].append(kw['cns'][i]['cn'])
-        del(kw['cns'])
-
         if kw.get('submit') == 'Cancel Edit':
             turbogears.flash("Edit group cancelled")
             raise turbogears.redirect('/group/show', cn=kw.get('cn')[0])