diff options
| author | Karl MacMillan <kmacmill@redhat.com> | 2007-12-11 12:42:13 -0500 |
|---|---|---|
| committer | Karl MacMillan <kmacmill@redhat.com> | 2007-12-11 12:42:13 -0500 |
| commit | d2378f13d0ce867175952346302d42c7a9a9fb2b (patch) | |
| tree | adbff5e6e1715f855d08aea20e995c188dcdc248 /ipa-server/ipa-gui/ipagui/subcontrollers/group.py | |
| parent | d53915954e68ad2fa1625ed016e7e65cd6f4e4e0 (diff) | |
| parent | b75d735b7e15198fbc0e7baad582696a97f0d5ec (diff) | |
| download | freeipa.git-d2378f13d0ce867175952346302d42c7a9a9fb2b.tar.gz freeipa.git-d2378f13d0ce867175952346302d42c7a9a9fb2b.tar.xz freeipa.git-d2378f13d0ce867175952346302d42c7a9a9fb2b.zip | |
Merge.
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/subcontrollers/group.py')
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/subcontrollers/group.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py index dbcc77b9..cc2944b2 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py @@ -271,14 +271,6 @@ class GroupController(IPAController): rv = client.update_group(new_group) # # If the group update succeeds, but below operations fail, we - if new_group.cn != kw.get('cn'): - group_modified = True - new_group.setValue('cn', kw['cn']) - - if group_modified: - rv = client.update_group(new_group) - # - # If the group update succeeds, but below operations fail, we # need to make sure a subsequent submit doesn't try to update # the group again. # @@ -313,7 +305,7 @@ class GroupController(IPAController): kw['dnadd'] = failed_adds group_modified = True except ipaerror.IPAError, e: - turbogears.flash("Group update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) + turbogears.flash("Updating group membership failed: " + str(e) + "<br/>" + e.detail[0]['desc']) return dict(form=group_edit_form, group=kw, members=member_dicts, tg_template='ipagui.templates.groupedit') @@ -331,7 +323,7 @@ class GroupController(IPAController): kw['dndel'] = failed_dels group_modified = True except ipaerror.IPAError, e: - turbogears.flash("Group update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) + turbogears.flash("Updating group membership failed: " + str(e) + "<br/>" + e.detail[0]['desc']) return dict(form=group_edit_form, group=kw, members=member_dicts, tg_template='ipagui.templates.groupedit') |