Browse Source

cleaned up media_overview.html; views.MediaView; path('images/<int:pk>'

Juan Carlos 4 years ago
parent
commit
56f4f88feb
3 changed files with 17 additions and 61 deletions
  1. 0 43
      marktplatz/templates/marktplatz/media_overview.html
  2. 0 1
      marktplatz/urls.py
  3. 17 17
      marktplatz/views.py

+ 0 - 43
marktplatz/templates/marktplatz/media_overview.html

@@ -1,43 +0,0 @@
-{% extends "base_generic.html" %}
-{% load tags %}
-{% block script %}
-
-{% endblock %}
-
-{% block content %}
-
-<div class="container-fluid">
-
-    <h3 style="margin-top: 10px">{{Product.name}} Media </h3>
-
- <table class="table table-sm table-hover">
-
-
-    {% for pic in media %}
-    <tr class=""   >
-        <td  scope="col"><img src="{{pic.image_small.url}}?v={{ pic.pk }}"  width="50" height="50" alt="{{ pic.name_for }}"> </td>
-        <td  scope="col">    {{pic.name_for }} </td>
-        <td scope="col"> <a href="{% url 'delete-media' pk=pic.pk %}"><button  type="button" class="btn btn-default"><i class="fas fa-trash-alt"></i> Löschen</button> </a> </td>
-
-    </tr>
-    {% endfor %}
-      {% for pic in video %}
-    <tr class=""   >
-        <td  scope="col"><img src="{{pic.image.url}}?v={{ pic.pk }}"  width="50" height="50" alt="Video: {{ pic.name_for }}"> </td>
-        <td  scope="col">    {{pic.name_for }} </td>
-
-        <td scope="col" > <a href="{% url 'delete-video' pk=pic.pk %}"><button  type="button" class="btn btn-default"><i class="fas fa-trash-alt"></i> Löschen</button> </a></td>
-
-    </tr>
-    {% endfor %}
-
-
-
-
- </table>
-
-         <a href="{% url 'add-image' Product.pk %}"> <button class="btn border-dark rounded-0 mybtn" type="submit">Add Media </button> </a>
-</div>
-
-
-{% endblock %}

+ 0 - 1
marktplatz/urls.py

@@ -85,7 +85,6 @@ urlpatterns = [
 
     path('pages/<slug:page>/', pagesView.as_view(template_name="marktplatz/generic.html"), name='pages-generic'),
     path('generic/', TemplateView.as_view(template_name="marktplatz/generic.html"), name='generic'),
-    path('images/<int:pk>', views.MediaView.as_view(), name='media-overview'),
     url(r'^delete_media/(?P<pk>\d+)/$', views.delete_media, name='delete-media'),
     url(r'^delete_video/(?P<pk>\d+)/$', views.delete_video, name='delete-video'),
     url(r'^upload/', include('django_file_form.urls')),

+ 17 - 17
marktplatz/views.py

@@ -1199,23 +1199,23 @@ handle_upload = FileFormUploader()
 
 
 
-class MediaView(LoginRequiredMixin, TemplateView):
-    template_name = 'marktplatz/media_overview.html'
-
-    def get(self, request, pk):
-        self.user = self.request.user
-        user= self.user
-        contact = Contact.objects.get(user=user)
-        if not Product.objects.filter(contact=contact).filter(pk=pk).exists():
-            raise Http404
-
-        context = request.GET.dict()
-        contact = Contact.objects.get(user=self.request.user)
-        product = get_object_or_404(Product, (Q(pk = pk) & Q(contact = contact)))
-        context['product'] = product
-        context['media'] = Media.objects.filter(product=product)
-        context['video'] = Video.objects.filter(product=product)
-        return render(request, self.template_name, context)
+# class MediaView(LoginRequiredMixin, TemplateView):
+#     template_name = 'marktplatz/media_overview.html'
+#
+#     def get(self, request, pk):
+#         self.user = self.request.user
+#         user= self.user
+#         contact = Contact.objects.get(user=user)
+#         if not Product.objects.filter(contact=contact).filter(pk=pk).exists():
+#             raise Http404
+#
+#         context = request.GET.dict()
+#         contact = Contact.objects.get(user=self.request.user)
+#         product = get_object_or_404(Product, (Q(pk = pk) & Q(contact = contact)))
+#         context['product'] = product
+#         context['media'] = Media.objects.filter(product=product)
+#         context['video'] = Video.objects.filter(product=product)
+#         return render(request, self.template_name, context)