diff options
| author | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-04 12:20:00 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-04 12:20:00 -0700 |
| commit | 99c793e2ad2cbe351650970ae5baad8a93c5a817 (patch) | |
| tree | b8ab18a3c4af87ae1294305bbe38a841b9e084bb | |
| parent | 2ac1b39f42e0e67fc42198abe79a809508865054 (diff) | |
| download | freeipa-99c793e2ad2cbe351650970ae5baad8a93c5a817.tar.gz freeipa-99c793e2ad2cbe351650970ae5baad8a93c5a817.tar.xz freeipa-99c793e2ad2cbe351650970ae5baad8a93c5a817.zip | |
Fixes none values in first/last name to display properly.
| -rw-r--r-- | ipa-python/entity.py | 4 | ||||
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid | 3 | ||||
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/groupeditform.kid | 4 | ||||
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/templates/groupshow.kid | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/ipa-python/entity.py b/ipa-python/entity.py index 2f0629cda..7afc3e63a 100644 --- a/ipa-python/entity.py +++ b/ipa-python/entity.py @@ -79,9 +79,9 @@ class Entity: """Get the list (array) of values for the attribute named name""" return self.data.get(name) - def getValue(self,name): + def getValue(self,name,default=None): """Get the first value for the attribute named name""" - value = self.data.get(name,[None]) + value = self.data.get(name,default) if isinstance(value,list) or isinstance(value,tuple): return value[0] else: diff --git a/ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid b/ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid index f0414216d..6141324d2 100644 --- a/ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid +++ b/ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid @@ -26,7 +26,8 @@ from ipagui.helpers import ipahelper ent_dn_esc = ipahelper.javascript_string_escape(entity.dn) ent_uid = entity.uid if ent_uid: - ent_name = "%s %s" % (entity.givenName, entity.sn) + ent_name = "%s %s" % (entity.getValue('givenName', ''), + entity.getValue('sn', '')) ent_descr = "(%s)" % entity.uid ent_type = "user" else: diff --git a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid index 55ccfdf09..764637f2b 100644 --- a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid @@ -116,8 +116,8 @@ from ipagui.helpers import ipahelper member_uid = member.get('uid') if member_uid: - member_name = "%s %s" % (member.get('givenName'), - member.get('sn')) + member_name = "%s %s" % (member.get('givenName', ''), + member.get('sn', '')) member_descr = "(%s)" % member.get('uid') member_type = "user" else: diff --git a/ipa-server/ipa-gui/ipagui/templates/groupshow.kid b/ipa-server/ipa-gui/ipagui/templates/groupshow.kid index 3bbf3c336..7be0db845 100644 --- a/ipa-server/ipa-gui/ipagui/templates/groupshow.kid +++ b/ipa-server/ipa-gui/ipagui/templates/groupshow.kid @@ -45,7 +45,7 @@ edit_url = tg.url('/groupedit', cn=group.get('cn')) member_uid = member.get('uid') if member_uid: - member_cn = "%s %s" % (member.get('givenName'), member.get('sn')) + member_cn = "%s %s" % (member.get('givenName', ''), member.get('sn', '')) member_desc = "(%s)" % member_uid member_type = "user" view_url = tg.url('usershow', uid=member_uid) |