From 2ac1b39f42e0e67fc42198abe79a809508865054 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kmccarth@redhat.com>
Date: Wed, 3 Oct 2007 18:21:41 -0700
Subject: Trickle the group_cn to group_dn down the layers.  Fix controller
 calls.

---
 ipa-server/ipa-gui/ipagui/controllers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ipa-server/ipa-gui/ipagui/controllers.py')

diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py
index 792b97a3..92b131d4 100644
--- a/ipa-server/ipa-gui/ipagui/controllers.py
+++ b/ipa-server/ipa-gui/ipagui/controllers.py
@@ -701,7 +701,7 @@ class Root(controllers.RootController):
                 if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
                     dnadds = [dnadds]
                 failed_adds = client.add_members_to_group(
-                        utf8_encode_values(dnadds), kw.get('cn'))
+                        utf8_encode_values(dnadds), group.dn)
                 kw['dnadd'] = failed_adds
         except ipaerror.IPAError, e:
             failed_adds = dnadds
@@ -797,7 +797,7 @@ class Root(controllers.RootController):
             return dict(form=group_edit_form, group=group_dict, members=member_dicts)
         except ipaerror.IPAError, e:
             turbogears.flash("Group edit failed: " + str(e))
-            raise turbogears.redirect('/groupshow', uid=kw.get('cn'))
+            raise turbogears.redirect('/groupshow', uid=cn)
 
     @expose()
     @identity.require(identity.not_anonymous())
@@ -859,7 +859,7 @@ class Root(controllers.RootController):
                 if not(isinstance(dnadds,list) or isinstance(dnadds,tuple)):
                     dnadds = [dnadds]
                 failed_adds = client.add_members_to_group(
-                        utf8_encode_values(dnadds), kw.get('cn'))
+                        utf8_encode_values(dnadds), new_group.dn)
                 kw['dnadd'] = failed_adds
         except ipaerror.IPAError, e:
             turbogears.flash("Group update failed: " + str(e))
@@ -876,7 +876,7 @@ class Root(controllers.RootController):
                 if not(isinstance(dndels,list) or isinstance(dndels,tuple)):
                     dndels = [dndels]
                 failed_dels = client.remove_members_from_group(
-                        utf8_encode_values(dndels), kw.get('cn'))
+                        utf8_encode_values(dndels), new_group.dn)
                 kw['dndel'] = failed_dels
         except ipaerror.IPAError, e:
             turbogears.flash("Group update failed: " + str(e))
-- 
cgit