harmacist/healthchecks
1
0
Fork 0
forked from GithubBackups/healthchecks
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15 from BetterWorks/channelCheckOpt

Browse Source 
fix and optimize checks channel view
This commit is contained in:
Pēteris Caune 2015-12-07 21:00:14 +02:00
commit ded7038145
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hc/front/views.py
View File

@ -200,7 +200,7 @@ def channels(request):
channel = Channel.objects.get(code=code) channel = Channel.objects.get(code=code)
except Channel.DoesNotExist: except Channel.DoesNotExist:
return HttpResponseBadRequest() return HttpResponseBadRequest()
if channel.user != request.user: if channel.user_id != request.user.id:
return HttpResponseForbidden() return HttpResponseForbidden()
new_checks = [] new_checks = []
@ -211,11 +211,12 @@ def channels(request):
check = Check.objects.get(code=code) check = Check.objects.get(code=code)
except Check.DoesNotExist: except Check.DoesNotExist:
return HttpResponseBadRequest() return HttpResponseBadRequest()
if check.user != request.user: if check.user_id != request.user.id:
return HttpResponseForbidden() return HttpResponseForbidden()
new_checks.append(check) new_checks.append(check)
channel.checks = new_checks channel.checks.clear()
channel.checks.add(*new_checks)
return redirect("hc-channels") return redirect("hc-channels")
channels = Channel.objects.filter(user=request.user).order_by("created") channels = Channel.objects.filter(user=request.user).order_by("created")
@ -257,10 +258,10 @@ def add_channel(request):
@uuid_or_400 @uuid_or_400
def channel_checks(request, code): def channel_checks(request, code):
channel = get_object_or_404(Channel, code=code) channel = get_object_or_404(Channel, code=code)
if channel.user != request.user: if channel.user_id != request.user.id:
return HttpResponseForbidden() return HttpResponseForbidden()
assigned = set([check.code for check in channel.checks.all()]) assigned = set(channel.checks.values_list('code', flat=True).distinct())
checks = Check.objects.filter(user=request.user).order_by("created") checks = Check.objects.filter(user=request.user).order_by("created")
ctx = { ctx = {