ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2024-11-26 18:37:12 +00:00
Code Issues Releases Wiki Activity

Fix activity in Guest model

Browse Source
This commit is contained in:
Yohann D'ANELLO 2020-03-27 19:16:38 +01:00
parent ceb5690838
commit 34949f0859
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/activity/forms.py
View File

@ -29,13 +29,6 @@ class ActivityForm(forms.ModelForm):
class GuestForm(forms.ModelForm): class GuestForm(forms.ModelForm):
def clean(self, **kwargs):
cleaned_data = super().clean()
self.instance.activity = cleaned_data["activity"] = Activity.objects.get(pk=1)
return cleaned_data
class Meta: class Meta:
model = Guest model = Guest
fields = ('last_name', 'first_name', 'inviter', ) fields = ('last_name', 'first_name', 'inviter', )

2
apps/activity/urls.py
View File

@ -10,7 +10,7 @@ app_name = 'activity'
urlpatterns = [ urlpatterns = [
path('', views.ActivityListView.as_view(), name='activity_list'), path('', views.ActivityListView.as_view(), name='activity_list'),
path('<int:pk>/', views.ActivityDetailView.as_view(), name='activity_detail'), path('<int:pk>/', views.ActivityDetailView.as_view(), name='activity_detail'),
path('<int:activity_pk>/invite/', views.ActivityInviteView.as_view(), name='activity_invite'), path('<int:pk>/invite/', views.ActivityInviteView.as_view(), name='activity_invite'),
path('<int:pk>/entry/', views.ActivityEntryView.as_view(), name='activity_entry'), path('<int:pk>/entry/', views.ActivityEntryView.as_view(), name='activity_entry'),
path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'), path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
path('new/', views.ActivityCreateView.as_view(), name='activity_create'), path('new/', views.ActivityCreateView.as_view(), name='activity_create'),

8
apps/activity/views.py
View File

@ -43,9 +43,15 @@ class ActivityUpdateView(LoginRequiredMixin, UpdateView):
class ActivityInviteView(LoginRequiredMixin, CreateView): class ActivityInviteView(LoginRequiredMixin, CreateView):
model = Guest model = Guest
form_class = GuestForm form_class = GuestForm
success_url = reverse_lazy('activity:activity_list')
template_name = "activity/activity_invite.html" template_name = "activity/activity_invite.html"
def form_valid(self, form):
form.instance.activity = Activity.objects.get(pk=self.kwargs["pk"])
return super().form_valid(form)
def get_success_url(self, **kwargs):
return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
class ActivityEntryView(LoginRequiredMixin, TemplateView): class ActivityEntryView(LoginRequiredMixin, TemplateView):
pass pass