Merge pull request #21 from qgis/fix_delete_period

Allow delete a Member and Period

Author: Xpirix

django_project/changes/templates/sponsor/delete.html

@@ -7,46 +7,28 @@
 {% endblock %}
 
 {% block page_title %}
-    <h1>Sustaining Member Deleted</h1>
+    <h1 class="title">Sustaining Member Deleted</h1>
 {% endblock page_title %}
 
 {% block content %}
-    <form action="" id="delete-confirmation" method="post">{% csrf_token %}
-        <div class="alert row">
-            <div class="col-lg-10">
-                <p class="lead">Please confirm you wish to delete the sustaining member below!</p>
+    <div class="box box-content">
+        <form action="" id="delete-confirmation" method="post">{% csrf_token %}
+            <div class="notification is-light is-danger">
+                <p class="is-size-5">Please confirm you wish to delete the sustaining member below!</p>
             </div>
-            <div class="col-lg-2">
-                <div class="btn-group">
-                    <a class="btn btn-default btn-sm tooltip-toggle"
-                       href="#"
-                       onClick="$('#delete-confirmation').submit()"
-                       data-title="Delete {{ sponsor.name }}">
-                        <span class="glyphicon glyphicon-minus"></span>
-                    </a>
-                    <a class="btn btn-default btn-sm tooltip-toggle"
-                       href='{% url "sponsor-list" %}'
-                       data-title="Cancel">
-                        <span class="glyphicon glyphicon-arrow-left"></span>
-                    </a>
-                </div>
+            <div class="content">
+                <h3 class="subtitle">Sustaining Member: {{ sponsor.name }}</h3>
             </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <h3>Sustaining Member: {{ sponsor.name }}</h3>
+            <div class="buttons is-right">
+                <button class="button is-danger" type="submit" title="Delete {{ sponsor.name }}">
+                    <span class="icon"><i class="fas fa-trash"></i></span>
+                    <span>Delete</span>
+                </button>
+                <a class="button is-light" href='{% url "sponsor-list" %}' title="Cancel">
+                    <span class="icon"><i class="fas fa-arrow-left"></i></span>
+                    <span>Cancel</span>
+                </a>
             </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-8">
-                {{ sponsor.description|base_markdown }}
-            </div>
-            <div class="col-lg-4">
-                {% if sponsor.logo %}
-                    <img class="img-responsive img-rounded"
-                         src="{{ sponsor.logo.url }}" />
-                {%  endif %}
-            </div>
-        </div>
-    </form>
+        </form>
+    </div>
 {% endblock %}

django_project/changes/templates/sponsor/detail.html

@@ -99,15 +99,21 @@ <h1 class="title">
                     </div>
 
                     {% if user_can_edit %}
-                    <footer class="card-footer p-3">
-                        <a href="/member/{{ slug }}/update" class="button is-success is-outlined card-footer-item">
-                            <span class="icon">
-                                <i class="fas fa-edit"></i>
-                            </span>
-                            <span>Update</span>
-                        </a>
-                    </footer>
-                {% endif %}
+                        <footer class="card-footer p-3 buttons">
+                            <a href="{% url "sponsor-delete" slug %}" class="button is-danger is-outlined card-footer-item">
+                                <span class="icon">
+                                    <i class="fas fa-trash"></i>
+                                </span>
+                                <span>Delete</span>
+                            </a>
+                            <a href="{% url "sponsor-update" slug %}" class="button is-success is-outlined card-footer-item">
+                                <span class="icon">
+                                    <i class="fas fa-edit"></i>
+                                </span>
+                                <span>Update</span>
+                            </a>
+                        </footer>
+                    {% endif %}
                 </div>
             {% else %}
                 <p>No description available.</p>

django_project/changes/views/sponsorship_period.py

@@ -237,7 +237,6 @@ def get_context_data(self, **kwargs):
 # noinspection PyAttributeOutsideInit
 class SponsorshipPeriodDeleteView(
         LoginRequiredMixin,
-        SponsorshipPeriodMixin,
         DeleteView):
     """Delete view for Sponsorship Period."""
     context_object_name = 'sponsorshipperiod'
@@ -315,26 +314,6 @@ def get_queryset(self):
         qs = SponsorshipPeriod.objects.filter(project=self.project)
         return qs
 
-    def get_form_kwargs(self):
-        """Get keyword arguments from form.
-
-        :returns keyword argument from the form
-        :rtype: dict
-        """
-        kwargs = super(
-                SponsorshipPeriodDeleteView,
-                self).get_form_kwargs()
-        sponsor_period_slug = self.kwargs.get('slug', None)
-        self.sponsorperiod = SponsorshipPeriod.objects.get(
-            slug=sponsor_period_slug)
-        self.project_slug = 'qgis'
-        self.project = Project.objects.get(slug=self.project_slug)
-        kwargs.update({
-            'user': self.request.user,
-            'instance': self.sponsorperiod,
-            'project': self.project
-        })
-        return kwargs
 
     def get_context_data(self, **kwargs):
         """Get the context data which is passed to a template.