Changeset - 570b9e82cbac
Parent rev.
Child rev.
[Not reviewed]
Merge default
0 2 0
Marcin Kuzminski - 16 years ago 2010-08-25 20:58:14
marcin@python-works.com
merged with bugfixes
2 files changed with 11 insertions and 12 deletions:
pylons_app/controllers/login.py
1
pylons_app/lib/auth.py
11
11
0 comments (0 inline, 0 general)
pylons_app/controllers/login.py
➞
Show inline comments
 
@@ -67,7 +67,6 @@ class LoginController(BaseController):
 
        user_model = UserModel()
 
        c.auto_active = False
 
        for perm in user_model.get_default().user_perms:
 
            print perm.permission.permission_name
 
            if perm.permission.permission_name == 'hg.register.auto_activate':
 
                c.auto_active = True
 
                break
pylons_app/lib/auth.py
➞
Show inline comments
 
@@ -124,8 +124,6 @@ def fill_data(user):
 
    else:
 
        user.is_authenticated = False
 
    meta.Session.remove()
 
    from pprint import pprint
 
    pprint(user.permissions)
 
    return user
 
 
def fill_perms(user):
 
@@ -141,16 +139,15 @@ def fill_perms(user):
 
    #===========================================================================
 
    # fetch default permissions
 
    #===========================================================================
 
    default_perms = sa.query(RepoToPerm, UserToPerm, Repository, Permission)\
 
        .outerjoin((UserToPerm, RepoToPerm.user_id == UserToPerm.user_id))\
 
    default_perms = sa.query(RepoToPerm, Repository, Permission)\
 
        .join((Repository, RepoToPerm.repository_id == Repository.repo_id))\
 
        .join((Permission, RepoToPerm.permission_id == Permission.permission_id))\
 
        .filter(RepoToPerm.user_id == sa.query(User).filter(User.username ==
 
                                            'default').one().user_id).all()
 
        .filter(RepoToPerm.user == sa.query(User).filter(User.username ==
 
                                            'default').scalar()).all()
 
 
    if user.is_admin:
 
        #=======================================================================
 
        # #admin have all rights set to admin
 
        # #admin have all default rights set to admin
 
        #=======================================================================
 
        user.permissions['global'].add('hg.admin')
 
 
@@ -164,8 +161,12 @@ def fill_perms(user):
 
        #=======================================================================
 
 
        #default global
 
        for perm in default_perms:
 
            user.permissions['global'].add(perm.UserToPerm.permission.permission_name)
 
        default_global_perms = sa.query(UserToPerm)\
 
            .filter(UserToPerm.user == sa.query(User).filter(User.username ==
 
            'default').one())
 
 
        for perm in default_global_perms:
 
            user.permissions['global'].add(perm.permission.permission_name)
 
 
        #default repositories
 
        for perm in default_perms:
 
@@ -183,8 +184,7 @@ def fill_perms(user):
 
        #=======================================================================
 
        # #overwrite default with user permissions if any
 
        #=======================================================================
 
        user_perms = sa.query(RepoToPerm, UserToPerm, Permission, Repository)\
 
            .outerjoin((UserToPerm, RepoToPerm.user_id == UserToPerm.user_id))\
 
        user_perms = sa.query(RepoToPerm, Permission, Repository)\
 
            .join((Repository, RepoToPerm.repository_id == Repository.repo_id))\
 
            .join((Permission, RepoToPerm.permission_id == Permission.permission_id))\
 
            .filter(RepoToPerm.user_id == user.user_id).all()
0 comments (0 inline, 0 general)
Server instance: clio-11633 This site is powered by Kallithea 0.7.0, which is © 2010–2025 by various authors & licensed under GPLv3. – Support