[MERGE] Don't crash if user's full name is unset

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We were getting a traceback because we were attempting to invoke the .strip() method on a NoneType.

This handles things properly for users who have the privacy flag set.

--
Stephen Gallagher
RHCE 804006346421761

Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sgallagh@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
#   f3t1eue4z55f3t25
# target_branch: bzr://bzr.fedorahosted.org/bzr/python-fedora/python-\
#   fedora-devel/
# testament_sha1: 36ba99f8d0956ce3472ed5187554eae36a321529
# timestamp: 2010-04-20 10:20:29 -0400
# base_revision_id: sgallagh@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\
#   3dk1bybf81j8hho3
# 
# Begin patch
=== modified file 'fedora/django/auth/models.py'
--- fedora/django/auth/models.py	2010-04-19 20:56:48 +0000
+++ fedora/django/auth/models.py	2010-04-20 14:19:07 +0000
@@ -122,4 +122,6 @@
     objects = FasUserManager()
 
     def get_full_name(self):
-        return self.name.strip()
+        if self.name:
+            return self.name.strip()
+        return self.username.strip()

# Begin bundle
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
_______________________________________________
infrastructure mailing list
infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/infrastructure

[Index of Archives]     [Fedora Development]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite News]     [KDE Users]

  Powered by Linux