From a41e51e23ad66e45e2d88fc1290e9abdd54dcb55 Mon Sep 17 00:00:00 2001
From: Pierre-antoine Comby <comby@crans.org>
Date: Wed, 25 Mar 2020 17:42:54 +0100
Subject: [PATCH] add member get side information

---
 apps/member/views.py              |  4 ++--
 templates/member/add_members.html | 12 ++++++++----
 templates/member/club_info.html   |  6 +++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/apps/member/views.py b/apps/member/views.py
index b518ad24..14322dcf 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -391,12 +391,12 @@ class ClubAddMemberView(LoginRequiredMixin, CreateView):
         return super().get_queryset().filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view")
                                              | PermissionBackend.filter_queryset(self.request.user, Membership,
                                                                                  "change"))
-
     def get_context_data(self, **kwargs):
+        club = Club.objects.get(pk=self.kwargs["pk"])
         context = super().get_context_data(**kwargs)
         context['formset'] = MemberFormSet()
         context['helper'] = FormSetHelper()
-
+        context['club'] = club
         context['no_cache'] = True
 
         return context
diff --git a/templates/member/add_members.html b/templates/member/add_members.html
index 8032af30..8b57e7d4 100644
--- a/templates/member/add_members.html
+++ b/templates/member/add_members.html
@@ -1,7 +1,11 @@
-{% extends "base.html" %}
+{% extends "member/noteowner_detail.html" %}
 {% load crispy_forms_tags %}
 {% load static %}
-{% block content %}
+
+{% block profile_info %}
+{% include "member/club_info.html" %}
+{% endblock %}
+{% block profile_content %}
 
 <form method="post" action="">
     {% csrf_token %}
@@ -10,9 +14,9 @@
         <input type="submit" name="submit" value="Add Members" class="btn btn-primary" id="submit-save">
     </div>
 </form>
+{% endblock %}
 
-<!-- Include formset plugin - including jQuery dependency -->
-<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+{% block extrajavascript %}
 <script src="{% static 'js/dynamic-formset.js' %}"></script>
 <script>
     $('.formset-row').formset({
diff --git a/templates/member/club_info.html b/templates/member/club_info.html
index d720b64f..d81bd870 100644
--- a/templates/member/club_info.html
+++ b/templates/member/club_info.html
@@ -33,9 +33,9 @@
         </dl>
     </div>
     <div class="card-footer text-center">
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' pk=object.pk %}"> {% trans "Add member" %}</a>
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=object.pk %}"> {% trans "Edit" %}</a>
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' pk=object.pk %}"> {% trans "Add roles" %}</a>
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' pk=club.pk %}"> {% trans "Add member" %}</a>
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_update' pk=club.pk %}"> {% trans "Edit" %}</a>
+        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_add_member' pk=club.pk %}"> {% trans "Add roles" %}</a>
         {% url 'member:club_detail' club.pk as club_detail_url %}
         {%if request.get_full_path != club_detail_url %}
         <a class="btn btn-primary btn-sm my-1" href="{{ user_profile_url }}">{% trans 'View Profile' %}</a>