Switch to unified view

a/Allura/allura/model/auth.py b/Allura/allura/model/auth.py
...
...
24
from allura.lib import helpers as h
24
from allura.lib import helpers as h
25
from allura.lib import plugin
25
from allura.lib import plugin
26
26
27
from .session import main_orm_session, main_doc_session
27
from .session import main_orm_session, main_doc_session
28
from .session import project_orm_session
28
from .session import project_orm_session
29
from .timeline import Node, ActivityObject
29
from .timeline import ActivityNode, ActivityObject
30
30
31
log = logging.getLogger(__name__)
31
log = logging.getLogger(__name__)
32
32
33
def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
33
def smart_str(s, encoding='utf-8', strings_only=False, errors='strict'):
34
    """
34
    """
...
...
269
        g = cls.query.find_and_modify(
269
        g = cls.query.find_and_modify(
270
            query={}, update={'$inc':{'next_uid': 1}},
270
            query={}, update={'$inc':{'next_uid': 1}},
271
            new=True)
271
            new=True)
272
        return g.next_uid
272
        return g.next_uid
273
273
274
class User(MappedClass, Node, ActivityObject):
274
class User(MappedClass, ActivityNode, ActivityObject):
275
    SALT_LEN=8
275
    SALT_LEN=8
276
    class __mongometa__:
276
    class __mongometa__:
277
        name='user'
277
        name='user'
278
        session = main_orm_session
278
        session = main_orm_session
279
        indexes = [ 'tool_data.sfx.userid' ]
279
        indexes = [ 'tool_data.sfx.userid' ]