IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes none values in first/last name to display properly.

Browse Source
This commit is contained in:
Kevin McCarthy 2007-10-04 12:20:00 -07:00
parent 2ac1b39f42
commit 99c793e2ad
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipa-python/entity.py
View File

@ -79,9 +79,9 @@ class Entity:
"""Get the list (array) of values for the attribute named name""" """Get the list (array) of values for the attribute named name"""
return self.data.get(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""" """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): if isinstance(value,list) or isinstance(value,tuple):
return value[0] return value[0]
else: else:

3
ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid
View File

@ -26,7 +26,8 @@ from ipagui.helpers import ipahelper
ent_dn_esc = ipahelper.javascript_string_escape(entity.dn) ent_dn_esc = ipahelper.javascript_string_escape(entity.dn)
ent_uid = entity.uid ent_uid = entity.uid
if ent_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_descr = "(%s)" % entity.uid
ent_type = "user" ent_type = "user"
else: else:

4
ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
View File

@ -116,8 +116,8 @@ from ipagui.helpers import ipahelper
member_uid = member.get('uid') member_uid = member.get('uid')
if member_uid: if member_uid:
member_name = "%s %s" % (member.get('givenName'), member_name = "%s %s" % (member.get('givenName', ''),
member.get('sn')) member.get('sn', ''))
member_descr = "(%s)" % member.get('uid') member_descr = "(%s)" % member.get('uid')
member_type = "user" member_type = "user"
else: else:

2
ipa-server/ipa-gui/ipagui/templates/groupshow.kid
View File

@ -45,7 +45,7 @@ edit_url = tg.url('/groupedit', cn=group.get('cn'))
member_uid = member.get('uid') member_uid = member.get('uid')
if member_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_desc = "(%s)" % member_uid
member_type = "user" member_type = "user"
view_url = tg.url('usershow', uid=member_uid) view_url = tg.url('usershow', uid=member_uid)