From 3cf16284352206d8aace7980b7c85be206b59ba5 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Fri, 24 Mar 2017 14:01:05 +0100
Subject: [PATCH] Fix weekmail new article link

---
 club/templates/club/club_tools.jinja | 2 +-
 com/urls.py                          | 2 +-
 com/views.py                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/club/templates/club/club_tools.jinja b/club/templates/club/club_tools.jinja
index b1c7f6fd..f28e4978 100644
--- a/club/templates/club/club_tools.jinja
+++ b/club/templates/club/club_tools.jinja
@@ -6,7 +6,7 @@
     <h4>{% trans %}Communication:{% endtrans %}</h4>
     <ul>
         <li> <a href="{{ url('com:news_new') }}?club={{ object.id }}">{% trans %}Create a news{% endtrans %}</a></li>
-        <li> <a href="{{ url('com:weekmail_article', club_id=object.id) }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
+        <li> <a href="{{ url('com:weekmail_article') }}?club={{ object.id }}">{% trans %}Post in the Weekmail{% endtrans %}</a></li>
     </ul>
     <h4>{% trans %}Counters:{% endtrans %}</h4>
     <ul>
diff --git a/com/urls.py b/com/urls.py
index d7052c8c..8a56d09a 100644
--- a/com/urls.py
+++ b/com/urls.py
@@ -9,7 +9,7 @@ urlpatterns = [
     url(r'^sith/edit/weekmail_destinations$', WeekmailDestinationEditView.as_view(), name='weekmail_destinations'),
     url(r'^weekmail$', WeekmailEditView.as_view(), name='weekmail'),
     url(r'^weekmail/preview$', WeekmailPreviewView.as_view(), name='weekmail_preview'),
-    url(r'^weekmail/club/((?P<club_id>[0-9]+)/)?new_article$', WeekmailArticleCreateView.as_view(), name='weekmail_article'),
+    url(r'^weekmail/new_article$', WeekmailArticleCreateView.as_view(), name='weekmail_article'),
     url(r'^weekmail/article/(?P<article_id>[0-9]+)/delete$', WeekmailArticleDeleteView.as_view(), name='weekmail_article_delete'),
     url(r'^weekmail/article/(?P<article_id>[0-9]+)/edit$', WeekmailArticleEditView.as_view(), name='weekmail_article_edit'),
     url(r'^news$', NewsListView.as_view(), name='news_list'),
diff --git a/com/views.py b/com/views.py
index 5b79301b..610d6968 100644
--- a/com/views.py
+++ b/com/views.py
@@ -333,7 +333,7 @@ class WeekmailArticleCreateView(QuickNotifMixin, CreateView): #XXX need to prote
     def get_initial(self):
         init = {}
         try:
-            init['club'] = Club.objects.filter(id=self.kwargs['club_id']).first()
+            init['club'] = Club.objects.filter(id=self.request.GET['club']).first()
         except: pass
         return init