Skip to content

Commit

Permalink
more cleans for model/authourization_group
Browse files Browse the repository at this point in the history
  • Loading branch information
tobes committed Mar 29, 2012
1 parent 9fbd513 commit 5708054
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions ckan/model/authorization_group.py
@@ -1,7 +1,7 @@
import datetime

from sqlalchemy import orm, types, Column, Table, ForeignKey, or_
#from meta import *

import meta
import user
import types as _types
Expand All @@ -15,7 +15,7 @@

authorization_group_user_table = Table('authorization_group_user', meta.metadata,
Column('id', types.UnicodeText, primary_key=True, default=_types.make_uuid),
Column('authorization_group_id', types.UnicodeText, ForeignKey('authorization_group.id'),
Column('authorization_group_id', types.UnicodeText, ForeignKey('authorization_group.id'),
nullable=False),
Column('user_id', types.UnicodeText, ForeignKey('user.id'), nullable=False)
)
Expand All @@ -25,7 +25,7 @@ class AuthorizationGroup(domain_object.DomainObject):

@classmethod
def search(cls, querystr, sqlalchemy_query=None):
'''Search name.
'''Search name.
'''
if sqlalchemy_query is None:
query = meta.Session.query(cls)
Expand All @@ -42,7 +42,7 @@ def get(cls, auth_group_reference):
query = query.filter(or_(cls.name==auth_group_reference,
cls.id==auth_group_reference))
return query.first()

class AuthorizationGroupUser(domain_object.DomainObject):
pass

Expand All @@ -51,7 +51,7 @@ def user_in_authorization_group(user, authorization_group):
q = q.filter_by(id=authorization_group.id)
q = q.filter(AuthorizationGroup.users.contains(user))
return q.count() == 1

def add_user_to_authorization_group(user, authorization_group, role):
assert not user_in_authorization_group(user, authorization_group)
from authz import add_user_to_role
Expand All @@ -69,13 +69,13 @@ def remove_user_from_authorization_group(user, authorization_group):
user=user)
for agr in q:
remove_user_from_role(user, agr.role, authorization_group)



meta.mapper(AuthorizationGroup, authorization_group_table, properties={
'users': orm.relation(user.User, lazy=True, secondary=authorization_group_user_table,
backref=orm.backref('authorization_groups', lazy=True))
'users': orm.relation(user.User, lazy=True, secondary=authorization_group_user_table,
backref=orm.backref('authorization_groups', lazy=True))
},
order_by=authorization_group_table.c.name)

meta.mapper(AuthorizationGroupUser, authorization_group_user_table)

0 comments on commit 5708054

Please sign in to comment.