[Freeipa-devel] [PATCH] fix 'None' displaying

[Kevin McCarthy]

Fixes the None string displaying for results when given/sn is empty.

-Kevin

-------------- next part --------------
# HG changeset patch
# User Kevin McCarthy <kmccarth at redhat.com>
# Date 1191525600 25200
# Node ID 66bfe41b5572dcfa726e37403948eb6a034dc97b
# Parent  2e368caed0742dcce6f0108eda7360866d1e280a
Fixes none values in first/last name to display properly.

diff -r 2e368caed074 -r 66bfe41b5572 ipa-python/entity.py
--- a/ipa-python/entity.py	Thu Oct 04 08:28:10 2007 -0700
+++ b/ipa-python/entity.py	Thu Oct 04 12:20:00 2007 -0700
@@ -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 -r 2e368caed074 -r 66bfe41b5572 ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid
--- a/ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid	Thu Oct 04 08:28:10 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/dynamiceditsearch.kid	Thu Oct 04 12:20:00 2007 -0700
@@ -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 -r 2e368caed074 -r 66bfe41b5572 ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
--- a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid	Thu Oct 04 08:28:10 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid	Thu Oct 04 12:20:00 2007 -0700
@@ -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 -r 2e368caed074 -r 66bfe41b5572 ipa-server/ipa-gui/ipagui/templates/groupshow.kid
--- a/ipa-server/ipa-gui/ipagui/templates/groupshow.kid	Thu Oct 04 08:28:10 2007 -0700
+++ b/ipa-server/ipa-gui/ipagui/templates/groupshow.kid	Thu Oct 04 12:20:00 2007 -0700
@@ -45,7 +45,7 @@ edit_url = tg.url('/groupedit', cn=group
 
       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)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 4054 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20071004/7a7488b3/attachment.bin>