Skip to content

Commit

Permalink
Merge pull request #1883 from T-CAIREM/au/fix/event/confusing_termino…
Browse files Browse the repository at this point in the history
…logy

refactor boolean `is_instructor` to `can_change_event` for clarity
  • Loading branch information
tompollard authored Feb 17, 2023
2 parents b835bdd + 164778f commit f0897a4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion physionet-django/events/templates/events/event_home.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{% include "message_snippet.html" %}
<div class="jumbotron">
<h1>Events Home</h1>
{% if is_instructor %}
{% if can_change_event %}
<p class="lead">Create new events and access event details.</p>
<p>
<button class = "btn btn-success" data-toggle="modal" data-target="#add-event-modal">
Expand Down
20 changes: 10 additions & 10 deletions physionet-django/events/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
@login_required
def update_event(request, event_slug, **kwargs):
user = request.user
is_instructor = user.has_perm('events.add_event')
can_change_event = user.has_perm('events.add_event')
if request.method == 'POST':
event = Event.objects.get(slug=event_slug)
event_form = AddEventForm(user=user, data=request.POST, instance=event)
if event_form.is_valid() and is_instructor:
if event_form.is_valid() and can_change_event:
event_form.save()
messages.success(request, "Updated Event Successfully")
else:
Expand All @@ -33,19 +33,19 @@ def update_event(request, event_slug, **kwargs):

@login_required
def get_event_details(request, event_slug):
is_instructor = request.user.has_perm('events.add_event')
if not is_instructor:
can_change_event = request.user.has_perm('events.add_event')
if not can_change_event:
return JsonResponse([{'error': 'You don\'t have permission to access event'}], safe=False)
event = Event.objects.filter(slug=event_slug).values()
return JsonResponse(list(event), safe=False)


@login_required
def toggle_cohost_status(request, event_slug, participant_id):
is_instructor = request.user.has_perm('events.add_event')
can_change_event = request.user.has_perm('events.add_event')
is_host = Event.objects.filter(slug=event_slug, host=request.user).exists()

if not is_instructor:
if not can_change_event:
return JsonResponse([{'status': False, 'message': 'You don\'t have permission to edit event'}], safe=False)
if not is_host:
return JsonResponse([{'status': False, 'message': 'You are not the host of this event'}], safe=False)
Expand All @@ -65,7 +65,7 @@ def event_home(request):
List of events
"""
user = request.user
is_instructor = user.has_perm('events.add_event')
can_change_event = user.has_perm('events.add_event')

EventApplicationResponseFormSet = modelformset_factory(EventApplication,
form=EventApplicationResponseForm, extra=0)
Expand All @@ -84,10 +84,10 @@ def event_home(request):

form_error = False

if is_instructor:
if can_change_event:
if request.method == 'POST' and 'add-event' in request.POST.keys():
event_form = AddEventForm(user=user, data=request.POST)
if event_form.is_valid() and is_instructor:
if event_form.is_valid() and can_change_event:
event_form.save()
return redirect(event_home)
else:
Expand Down Expand Up @@ -141,7 +141,7 @@ def event_home(request):
'events_past': events_past,
'event_form': event_form,
'url_prefix': url_prefix,
'is_instructor': is_instructor,
'can_change_event': can_change_event,
'form_error': form_error,
'participation_response_formset': participation_response_formset,
})
Expand Down

0 comments on commit f0897a4

Please sign in to comment.