diff options
| author | Simo Sorce <ssorce@redhat.com> | 2007-08-28 10:46:03 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2007-08-28 10:46:03 -0400 |
| commit | 46eeca740ee4d66bfd4f062896220dfb5527f5b6 (patch) | |
| tree | b5a91cf249e823ddb9ab01e9797c742caa90de50 /ipa-server/ipa-gui/ipagui/controllers.py | |
| parent | 4702eb907585556d83b3373bf06705d83ae3ed2d (diff) | |
| parent | 6eea6664e079d187c3b0420b4283af35205d3b03 (diff) | |
| download | freeipa-46eeca740ee4d66bfd4f062896220dfb5527f5b6.tar.gz freeipa-46eeca740ee4d66bfd4f062896220dfb5527f5b6.tar.xz freeipa-46eeca740ee4d66bfd4f062896220dfb5527f5b6.zip | |
Merge in with upstream
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/controllers.py')
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/controllers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py index eb89e5a6c..7dff9c908 100644 --- a/ipa-server/ipa-gui/ipagui/controllers.py +++ b/ipa-server/ipa-gui/ipagui/controllers.py @@ -92,7 +92,7 @@ class Root(controllers.RootController): if tg_errors: turbogears.flash("There was a problem with the form!") - user = client.get_user(uid) + user = client.get_user_by_uid(uid) user_dict = user.toDict() # store a copy of the original user for the update later user_data = b64encode(dumps(user_dict)) @@ -155,7 +155,7 @@ class Root(controllers.RootController): def usershow(self, uid): """Retrieve a single user for display""" try: - user = client.get_user(uid) + user = client.get_user_by_uid(uid) return dict(user=user.toDict(), fields=forms.user.UserFields()) except ipaerror.IPAError, e: turbogears.flash("User show failed: " + str(e)) |