diff --git a/AKSubmission/forms.py b/AKSubmission/forms.py index 68ecd133d46b6a1dc20b8d30725b6779cb61784a..9cd0f121ba0870d8f7978dd71d2afba7ec492720 100644 --- a/AKSubmission/forms.py +++ b/AKSubmission/forms.py @@ -24,3 +24,8 @@ class AKForm(forms.ModelForm): widgets = { 'requirements': forms.CheckboxSelectMultiple, } + + +class AKWishForm(AKForm): + class Meta(AKForm.Meta): + exclude = ['owners'] diff --git a/AKSubmission/templates/AKSubmission/submission_overview.html b/AKSubmission/templates/AKSubmission/submission_overview.html index 7bab73f06895309bbb5ff5d372cc450f1c8f5ca1..0fbaf8073fc683270e40fc3e7b4ce40d5bb487f6 100644 --- a/AKSubmission/templates/AKSubmission/submission_overview.html +++ b/AKSubmission/templates/AKSubmission/submission_overview.html @@ -19,7 +19,8 @@ <div class="jumbotron" style="margin-top:20px;"> <h2>{% trans "Submit" %}</h2> <a href="{% url 'submit:submit_ak' event_slug=event.slug %}" class="btn btn-primary">{% trans "New AK" %}</a> - <a href="#" class="btn btn-info">{% trans "New AK Wish" %}</a> + <a href="{% url 'submit:submit_ak_wish' event_slug=event.slug %}" + class="btn btn-info">{% trans "New AK Wish" %}</a> </div> diff --git a/AKSubmission/templates/AKSubmission/submit_new.html b/AKSubmission/templates/AKSubmission/submit_new.html index 49b02bdcd569f7fa3b971ca5184c03fb12fe6097..b60820ceb806b168de12cfaf629574e60822a44d 100644 --- a/AKSubmission/templates/AKSubmission/submit_new.html +++ b/AKSubmission/templates/AKSubmission/submit_new.html @@ -15,7 +15,9 @@ {% block content %} {% include "AKSubmission/messages.html" %} - <h2>{% trans 'New AK' %}</h2> + {% block headline %} + <h2>{% trans 'New AK' %}</h2> + {% endblock %} <form method="POST" class="post-form">{% csrf_token %} {% bootstrap_form form %} {% buttons %} diff --git a/AKSubmission/templates/AKSubmission/submit_new_wish.html b/AKSubmission/templates/AKSubmission/submit_new_wish.html new file mode 100644 index 0000000000000000000000000000000000000000..b0315ab0177a49ac8e0d00ed5856dc0ca9669a4c --- /dev/null +++ b/AKSubmission/templates/AKSubmission/submit_new_wish.html @@ -0,0 +1,16 @@ +{% extends 'AKSubmission/submit_new.html' %} + +{% load i18n %} + +{% block title %}{{ event.slug }} - {% trans "New AK Wish" %}{% endblock %} + +{% block breadcrumbs %} + <li class="breadcrumb-item"><a href="#">AKPlanning</a></li> + <li class="breadcrumb-item"><a href="#">{{ event.slug }}</a></li> + <li class="breadcrumb-item"><a href="#">{% trans "AK Submission" %}</a></li> + <li class="breadcrumb-item active">{% trans "New AK Wish" %}</li> +{% endblock %} + +{% block headline %} + <h2>{% trans 'New AK Wish' %}</h2> +{% endblock %} \ No newline at end of file diff --git a/AKSubmission/urls.py b/AKSubmission/urls.py index f723f0ccb88f1007afd15bc06ee8e6295b7d27bb..d3c995a42f9457801940e0765694ab77549cedc1 100644 --- a/AKSubmission/urls.py +++ b/AKSubmission/urls.py @@ -14,6 +14,7 @@ urlpatterns = [ path('aks/category/<int:category_pk>', views.AKListByCategoryView.as_view(), name='ak_list_by_category'), path('aks/tag/<int:tag_pk>', views.AKListByTagView.as_view(), name='ak_list_by_tag'), path('new/', views.AKSubmissionView.as_view(), name='submit_ak'), + path('new_wish/', views.AKWishSubmissionView.as_view(), name='submit_ak_wish'), ]) ), ] diff --git a/AKSubmission/views.py b/AKSubmission/views.py index e7aea578054d48bd8eefd33bb3ca3cd26d2c0520..13eb7c07741c8f05af41bb72bb7d2694eba5b244 100644 --- a/AKSubmission/views.py +++ b/AKSubmission/views.py @@ -4,9 +4,11 @@ from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ from django.views.generic import ListView, DetailView, CreateView -from AKModel.models import AK, AKCategory, AKTag, Event -from AKModel.views import FilterByEventSlugMixin, EventSlugMixin -from AKSubmission.forms import AKForm +from AKModel.models import AK, AKCategory, AKTag +from AKModel.models import Event +from AKModel.views import EventSlugMixin +from AKModel.views import FilterByEventSlugMixin +from AKSubmission.forms import AKForm, AKWishForm class SubmissionOverviewView(FilterByEventSlugMixin, ListView): @@ -87,3 +89,8 @@ class AKSubmissionView(EventSlugMixin, CreateView): # TODO return super().form_valid(form) + + +class AKWishSubmissionView(AKSubmissionView): + template_name = 'AKSubmission/submit_new_wish.html' + form_class = AKWishForm