From 39661b8de733d5eea2d063ccaf7741ff7f03d63f Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Tue, 3 May 2016 12:06:03 +0200
Subject: [PATCH] Add new club view

---
 club/templates/club/club_edit_prop.jinja |  2 +-
 club/templates/club/club_list.jinja      |  3 +++
 club/urls.py                             |  1 +
 club/views.py                            | 10 ++++++++++
 core/management/commands/populate.py     | 21 +++++++++++++++++++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/club/templates/club/club_edit_prop.jinja b/club/templates/club/club_edit_prop.jinja
index 23d63d11..400be64d 100644
--- a/club/templates/club/club_edit_prop.jinja
+++ b/club/templates/club/club_edit_prop.jinja
@@ -2,7 +2,7 @@
 
 {% block content %}
     <h2>Edit club properties</h2>
-    <form action="{{ url('club:club_prop', club_id=club.id) }}" method="post">
+    <form action="" method="post">
         {% csrf_token %}
         {{ form.as_p() }}
         <p><input type="submit" value="Save!" /></p>
diff --git a/club/templates/club/club_list.jinja b/club/templates/club/club_list.jinja
index 4685ebf7..9cbe2d43 100644
--- a/club/templates/club/club_list.jinja
+++ b/club/templates/club/club_list.jinja
@@ -17,6 +17,9 @@
 {%- endmacro %}
 
 {% block content %}
+    {% if user.is_superuser or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+        <p><a href="{{ url('club:club_new') }}">New club</a></p>
+    {% endif %}
     {% if club_list %}
         <h3>Club list</h3>
         <ul>
diff --git a/club/urls.py b/club/urls.py
index 7cf22f3d..96e7a27b 100644
--- a/club/urls.py
+++ b/club/urls.py
@@ -4,6 +4,7 @@ from club.views import *
 
 urlpatterns = [
     url(r'^$', ClubListView.as_view(), name='club_list'),
+    url(r'^new$', ClubCreateView.as_view(), name='club_new'),
     url(r'^(?P<club_id>[0-9]+)/$', ClubView.as_view(), name='club_view'),
     url(r'^(?P<club_id>[0-9]+)/edit$', ClubEditView.as_view(), name='club_edit'),
     url(r'^(?P<club_id>[0-9]+)/members$', ClubMembersView.as_view(), name='club_members'),
diff --git a/club/views.py b/club/views.py
index a75bb60e..857728bd 100644
--- a/club/views.py
+++ b/club/views.py
@@ -97,3 +97,13 @@ class ClubEditPropView(CanEditPropMixin, UpdateView):
     fields = ['name', 'unix_name', 'parent']
     template_name = 'club/club_edit_prop.jinja'
 
+
+class ClubCreateView(CanEditPropMixin, CreateView):
+    """
+    Create a club (for the Sith admin)
+    """
+    model = Club
+    pk_url_kwarg = "club_id"
+    fields = ['name', 'unix_name', 'parent']
+    template_name = 'club/club_edit_prop.jinja'
+
diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py
index b832293a..d951d1ae 100644
--- a/core/management/commands/populate.py
+++ b/core/management/commands/populate.py
@@ -48,6 +48,24 @@ Welcome to the wiki page!
             s.save()
             s.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
             s.save()
+            # Adding user public
+            public = User(username='public', last_name="Not subscribed", first_name="Public",
+                     email="public@git.an",
+                     date_of_birth="1942-06-12",
+                     is_superuser=False, is_staff=False)
+            public.set_password("plop")
+            public.save()
+            public.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+            public.save()
+            # Adding user Subscriber
+            subscriber = User(username='subscriber', last_name="User", first_name="Subscribed",
+                     email="Subscribed@git.an",
+                     date_of_birth="1942-06-12",
+                     is_superuser=False, is_staff=False)
+            subscriber.set_password("plop")
+            subscriber.save()
+            subscriber.view_groups=[Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id]
+            subscriber.save()
             # Adding user Guy
             u = User(username='guy', last_name="Carlier", first_name="Guy",
                      email="guy@git.an",
@@ -87,6 +105,9 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site.
             ## Richard
             Subscription(member=Subscriber.objects.filter(pk=r.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
                     payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0]).save()
+            ## Subscriber
+            Subscription(member=Subscriber.objects.filter(pk=subscriber.pk).first(), subscription_type=list(settings.SITH_SUBSCRIPTIONS.keys())[0],
+                    payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0]).save()
 
             # Clubs
             Club(name="Bibo'UT", unix_name="bibout",