sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

now working with permissions defined in models.py

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-11 15:23:26 +01:00
parent 67c3c1e4a3
commit 293d4dca17
7 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rowers/views/teamviews.py
View File

@@ -5,10 +5,12 @@ from __future__ import unicode_literals
from rowers.views.statements import *
def get_team_by_pk(request,team_id):
return get_object_or_404(Team,pk=team_id)
#@login_required()
@permission_required('teams.view_team',fn=objectgetter(Team,'id'))
def team_view(request,id=0,userid=0):
@permission_required('teams.view_team',fn=get_team_by_pk,raise_exception=True)
def team_view(request,team_id=0,userid=0):
ismember = 0
hasrequested = 0
r = getrequestrower(request,userid=userid)
@@ -19,7 +21,7 @@ def team_view(request,id=0,userid=0):
try:
t = Team.objects.get(id=id)
t = Team.objects.get(id=team_id)
except Team.DoesNotExist:
raise Http404("Team doesn't exist")
@@ -84,7 +86,7 @@ def team_view(request,id=0,userid=0):
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
'url':reverse(team_view,kwargs={'team_id':team_id}),
'name': t.name
}
]
@@ -120,7 +122,7 @@ def team_leaveconfirm_view(request,id=0):
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
'url':reverse(team_view,kwargs={'team_id':id}),
'name': t.name
},
{
@@ -451,7 +453,7 @@ def team_requestmembership_view(request,teamid,userid):
url = reverse('team_view',kwargs={
'id':int(teamid),
'team_id':int(teamid),
})
@@ -572,7 +574,7 @@ def rower_invitations_view(request,code=None,message='',successmessage=''):
messages.info(request,text)
teamid=res
url = reverse(team_view,kwargs={
'id':teamid,
'team_id':teamid,
})
else:
messages.error(request,text)
@@ -610,7 +612,7 @@ def team_edit_view(request,id=0):
url = reverse(team_view,
kwargs={
'id':int(id),
'team_id':int(id),
}
)
@@ -628,7 +630,7 @@ def team_edit_view(request,id=0):
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
'url':reverse(team_view,kwargs={'team_id':id}),
'name': t.name
},
{
@@ -710,11 +712,11 @@ def team_create_view(request):
})
#@login_required()
@permission_required('teams.delete_team',fn=objectgetter(Team,'id'))
def team_deleteconfirm_view(request,id):
@permission_required('teams.delete_team',fn=get_team_by_pk)
def team_deleteconfirm_view(request,team_id):
r = getrower(request.user)
try:
t = Team.objects.get(id=id)
t = Team.objects.get(id=team_id)
except Team.DoesNotExist:
raise Http404("This team doesn't exist")
if t.manager != request.user:
@@ -728,11 +730,11 @@ def team_deleteconfirm_view(request,id):
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
'url':reverse(team_view,kwargs={'team_id':team_id}),
'name': t.name
},
{
'url':reverse(team_deleteconfirm_view,kwargs={'id':id}),
'url':reverse(team_deleteconfirm_view,kwargs={'team_id':team_id}),
'name': 'Leave'
}
]
@@ -784,7 +786,7 @@ def team_members_stats_view(request,id):
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
'url':reverse(team_view,kwargs={'team_id':id}),
'name': t.name
},
{