diff options
| author | Simo Sorce <ssorce@redhat.com> | 2007-09-20 16:58:54 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2007-09-20 16:58:54 -0400 |
| commit | fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8 (patch) | |
| tree | c7ef1ebd964eb6c5fc42e681c5527b514338ae60 /ipa-server/ipa-gui/ipagui/proxyprovider.py | |
| parent | b85668579ec3fc69c2ed709533f8bd8d00e0e7e9 (diff) | |
| parent | 4e79c37c604f0e51dab19fc28063b3186df0c6d9 (diff) | |
| download | freeipa-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.tar.gz freeipa-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.tar.xz freeipa-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.zip | |
Merge conflicts between rob and kevin patches
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/proxyprovider.py')
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/proxyprovider.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ipa-server/ipa-gui/ipagui/proxyprovider.py b/ipa-server/ipa-gui/ipagui/proxyprovider.py index cc9d9164..4499e797 100644 --- a/ipa-server/ipa-gui/ipagui/proxyprovider.py +++ b/ipa-server/ipa-gui/ipagui/proxyprovider.py @@ -32,19 +32,19 @@ class ProxyIdentity(object): user= property(_get_user) def _get_user_name(self): - if not self.user: + if not self._user: return None - return self.user.user_name + return self._user.user_name user_name= property(_get_user_name) - def _get_name(self): - if not self.user: + def _get_display_name(self): + if not self._user: return None - return self.user.name - user_name= property(_get_name) + return self._user.display_name + display_name= property(_get_display_name) def _get_anonymous(self): - return not self.user + return not self._user anonymous= property(_get_anonymous) def _get_permissions(self): |