Switch to unified view

a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
...
...
312
    def icon_url(self):
312
    def icon_url(self):
313
        icon_url = None
313
        icon_url = None
314
        if self.private_project() and self.private_project().icon:
314
        if self.private_project() and self.private_project().icon:
315
            icon_url = self.url()+'user_icon'
315
            icon_url = self.url()+'user_icon'
316
        elif self.preferences.email_address:
316
        elif self.preferences.email_address:
317
            icon_url = g.gravatar(self.preferences.email_address, default=None)
317
            icon_url = g.gravatar(self.preferences.email_address)
318
        return icon_url
318
        return icon_url
319
319
320
    @classmethod
320
    @classmethod
321
    def upsert(cls, username):
321
    def upsert(cls, username):
322
        u = cls.query.get(username=username)
322
        u = cls.query.get(username=username)