Switch to unified view

a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
...
...
317
            elif u.display_name: uname = u.display_name
317
            elif u.display_name: uname = u.display_name
318
            else: uname = u._id
318
            else: uname = u._id
319
            return '*user-%s' % uname
319
            return '*user-%s' % uname
320
        return '**unknown name role: %s' % self._id # pragma no cover
320
        return '**unknown name role: %s' % self._id # pragma no cover
321
321
322
    @classmethod
323
    def upsert(cls, **kw):
324
        try:
325
            obj = cls(**kw)
326
            session(obj).insert_now(obj, state(obj))
327
        except pymongo.errors.DuplicateKeyError:
328
            session(obj).expunge(obj)
329
            obj = cls.query.get(**kw)
330
        return obj
331
322
    @property
332
    @property
323
    def special(self):
333
    def special(self):
324
        if self.name:
334
        if self.name:
325
            return '*' == self.name[0]
335
            return '*' == self.name[0]
326
        if self.user_id:
336
        if self.user_id: