vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add is_org_member to the prototype_view. Fix some line length problems. Fix a bug with using uuid objects as strings.

Browse source
This commit is contained in:
yackob03 2014-01-21 17:32:49 -05:00
parent 58412ff6b3
commit 7ceb249858
2 changed files with 52 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

29
data/model.py
View file

@ -682,9 +682,9 @@ def delete_prototype_permission(org, uid):
def get_prototype_permission(org, uid):
found = None
try:
return PermissionPrototype.get(PermissionPrototype.org == org, PermissionPrototype.uuid == uid)
return PermissionPrototype.get(PermissionPrototype.org == org,
PermissionPrototype.uuid == uid)
except PermissionPrototype.DoesNotExist:
return None
@ -692,12 +692,17 @@ def get_prototype_permission(org, uid):
def get_prototype_permissions(org):
ActivatingUser = User.alias()
DelegateUser = User.alias()
where = PermissionPrototype.select().where(PermissionPrototype.org == org)
join1 = where.join(ActivatingUser, JOIN_LEFT_OUTER, on=(ActivatingUser.id == PermissionPrototype.activating_user))
join2 = join1.join(DelegateUser, JOIN_LEFT_OUTER, on=(DelegateUser.id == PermissionPrototype.delegate_user))
join3 = join2.join(Team, JOIN_LEFT_OUTER, on=(Team.id == PermissionPrototype.delegate_team))
join4 = join3.join(Role, JOIN_LEFT_OUTER, on=(Role.id == PermissionPrototype.role))
return join4
query = (PermissionPrototype
.select()
.where(PermissionPrototype.org == org)
.join(ActivatingUser, JOIN_LEFT_OUTER,
on=(ActivatingUser.id == PermissionPrototype.activating_user))
.join(DelegateUser, JOIN_LEFT_OUTER,
on=(DelegateUser.id == PermissionPrototype.delegate_user))
.join(Team, JOIN_LEFT_OUTER,
on=(Team.id == PermissionPrototype.delegate_team))
.join(Role, JOIN_LEFT_OUTER, on=(Role.id == PermissionPrototype.role)))
return query
def update_prototype_permission(org, uid, role_name):
@ -711,10 +716,12 @@ def update_prototype_permission(org, uid, role_name):
return found
def add_prototype_permission(org, role_name, activating_user, delegate_user=None, delegate_team=None):
def add_prototype_permission(org, role_name, activating_user,
delegate_user=None, delegate_team=None):
new_role = Role.get(Role.name == role_name)
uid = uuid.uuid4()
return PermissionPrototype.create(org=org, uuid=uid, role=new_role, activating_user=activating_user,
uid = str(uuid.uuid4())
return PermissionPrototype.create(org=org, uuid=uid, role=new_role,
activating_user=activating_user,
delegate_user=delegate_user, delegate_team=delegate_team)