From de814e2b0339a7761dc63bb61fa66d6cdb0f4280 Mon Sep 17 00:00:00 2001 From: Michael Hall Date: Thu, 20 Sep 2018 23:57:23 -0400 Subject: [PATCH] Allow moving an event from one team to another. Fixes #120 --- events/forms.py | 7 ++++ events/templates/events/change_team_form.html | 4 +++ get_together/static/css/get_together.css | 8 +++++ .../get_together/events/change_team.html | 24 ++++++++++++++ .../get_together/events/show_event.html | 16 +++------ .../get_together/teams/team_page_base.html | 14 -------- get_together/urls.py | 1 + get_together/views/events.py | 33 +++++++++++++++++++ 8 files changed, 81 insertions(+), 26 deletions(-) create mode 100644 events/templates/events/change_team_form.html create mode 100644 get_together/templates/get_together/events/change_team.html diff --git a/events/forms.py b/events/forms.py index 09ed31b..174b922 100644 --- a/events/forms.py +++ b/events/forms.py @@ -345,6 +345,13 @@ class CancelEventForm(forms.Form): confirm = forms.BooleanField(label="Yes, cancel this event", required=True) reason = forms.CharField(label=_("Reason for cancellation"), widget=forms.widgets.Textarea) +class ChangeEventHostForm(forms.ModelForm): + class Meta: + model = Event + fields = [ + 'team' + ] + class EventInviteMemberForm(forms.Form): member = forms.ChoiceField(label=_("")) diff --git a/events/templates/events/change_team_form.html b/events/templates/events/change_team_form.html new file mode 100644 index 0000000..84d102f --- /dev/null +++ b/events/templates/events/change_team_form.html @@ -0,0 +1,4 @@ + +{{ change_form }} +
+ \ No newline at end of file diff --git a/get_together/static/css/get_together.css b/get_together/static/css/get_together.css index 41d5fde..3462768 100644 --- a/get_together/static/css/get_together.css +++ b/get_together/static/css/get_together.css @@ -40,7 +40,15 @@ form { width: 16px; height: 16px; } +.gt-profile { + position: relative; +} +.gt-profile .gt-profile-badges { + position: absolute; + top: 24px; + left: 6px; +} .btn-googleplus { color: #FFFFFF; background-color: #DB4437; diff --git a/get_together/templates/get_together/events/change_team.html b/get_together/templates/get_together/events/change_team.html new file mode 100644 index 0000000..8b7a9f0 --- /dev/null +++ b/get_together/templates/get_together/events/change_team.html @@ -0,0 +1,24 @@ +{% extends "get_together/base.html" %} +{% load static %} +{% block content %} +

Change host for: {{event.name}}

+

Select which of your teams you would like to host this event.

+
+{% csrf_token %} +{% include "events/change_team_form.html" %} +
+ +Cancel +
+{% endblock %} + + +{% block javascript %} + +{% endblock %} diff --git a/get_together/templates/get_together/events/show_event.html b/get_together/templates/get_together/events/show_event.html index ae773b0..a1511fa 100644 --- a/get_together/templates/get_together/events/show_event.html +++ b/get_together/templates/get_together/events/show_event.html @@ -14,19 +14,10 @@ {% block styles %} {% endblock %} @@ -155,6 +146,7 @@ textarea {
Event Details + Change Host Manage Sponsors Manage Talks Manage Attendees @@ -298,9 +290,9 @@ textarea { {% for attendee in attendee_list %}
- - {% for badge in attendee.user.user.account.badges.all %}{% endfor %} -
+ + {% for badge in attendee.user.user.account.badges.all %}{% endfor %} +
{{attendee.user}} {% if attendee.user.user == request.user and not event.is_over %} diff --git a/get_together/templates/get_together/teams/team_page_base.html b/get_together/templates/get_together/teams/team_page_base.html index ca26c06..c0f0b0f 100644 --- a/get_together/templates/get_together/teams/team_page_base.html +++ b/get_together/templates/get_together/teams/team_page_base.html @@ -3,20 +3,6 @@ {% block add_to_title %} | {{team.name}}{% endblock %} -{% block styles %} - -{% endblock %} - {% block content %}
diff --git a/get_together/urls.py b/get_together/urls.py index c600353..2634fb5 100644 --- a/get_together/urls.py +++ b/get_together/urls.py @@ -85,6 +85,7 @@ urlpatterns = [ path('events//+new-event-team/', views.new_event_add_team, name='new-event-add-team'), path('events//+edit/', views.edit_event, name='edit-event'), + path('events//+host/', views.change_event_host, name='change-team'), path('events//+attend/', views.attend_event, name='attend-event'), path('events//+attended/', views.attended_event, name='attended-event'), path('events//+attendees/', views.manage_attendees, name='manage-attendees'), diff --git a/get_together/views/events.py b/get_together/views/events.py index 79b9632..cf6f208 100644 --- a/get_together/views/events.py +++ b/get_together/views/events.py @@ -40,6 +40,7 @@ from events.forms import ( EventInviteMemberForm, EventContactForm, SponsorForm, + ChangeEventHostForm, ) from events import location from events.utils import verify_csrf @@ -670,6 +671,38 @@ def edit_event(request, event_id): else: return redirect('home') +@login_required +def change_event_host(request, event_id): + event = get_object_or_404(Event, id=event_id) + if not request.user.profile.can_edit_event(event): + messages.add_message(request, messages.WARNING, message=_('You can not change this event\'s host')) + return redirect(event.get_absolute_url()) + + if request.method == 'GET': + form = ChangeEventHostForm(instance=event) + form.fields['team'].queryset = Team.objects.filter(member__user=request.user.profile, member__role__gte=Member.MODERATOR).order_by('name') + + context = { + 'event': event, + 'change_form': form, + } + return render(request, 'get_together/events/change_team.html', context) + elif request.method == 'POST': + form = ChangeEventHostForm(request.POST, instance=event) + form.fields['team'].queryset = Team.objects.filter(member__user=request.user.profile, member__role__gte=Member.MODERATOR).order_by('name') + if form.is_valid(): + new_event = form.save() + messages.add_message(request, messages.SUCCESS, message=_('Your event host has been changed.')) + return redirect(new_event.get_absolute_url()) + else: + context = { + 'event': event, + 'change_form': form, + } + return render(request, 'get_together/orgs/request_to_join.html', context) + else: + return redirect('home') + @login_required def delete_event(request, event_id): event = get_object_or_404(Event, id=event_id)