Bläddra i källkod

query for "meine-projekte" list.

Juan Carlos 4 år sedan
förälder
incheckning
aa1da498a7
2 ändrade filer med 16 tillägg och 9 borttagningar
  1. 2 2
      marktplatz/templates/marktplatz/myProducts.html
  2. 14 7
      marktplatz/views.py

+ 2 - 2
marktplatz/templates/marktplatz/myProducts.html

@@ -22,7 +22,7 @@ $('form').submit(function () {
 
 <h3 style="margin-top: 10px"> {{user.username}}'s products </h3>
 
-{% if product_list %}
+{% if object_list %}
  <table class="table table-sm table-hover">
     <caption>Projekte</caption>
 
@@ -36,7 +36,7 @@ $('form').submit(function () {
         <th scope="col"> Freischaltung beantragen</th>
 
     </tr>
-    {% for product in product_list %}
+    {% for product in object_list %}
     <tr class="{{ product.pk }}"   >
         <td  scope="col"><img src="{{product.media_set.first.image_small.url}}"  width="50" height="50" alt="{{ product.pk }}"> </td>
         <td  scope="col"> <a href="{% url 'product-detail' product.pk %}">   {{product.name|upper }} </a></td>

+ 14 - 7
marktplatz/views.py

@@ -42,7 +42,7 @@ from newsletter.forms import *
 from newsletter.views import *
 from post_office import mail
 
-from marktplatz.models import *
+from .models import *
 from .forms import *
 from .utils import *
 
@@ -808,7 +808,7 @@ class ErnaehrungsProjektUpdateView(ProductUpdateView):
 
 class EnergyProjektUpdateView(ProductUpdateView):
     model = EnergyProjekt
-    form_class = EnergyForm 
+    form_class = EnergyForm
 
 
 class addImageView(LoginRequiredMixin, FormView):
@@ -976,14 +976,21 @@ class UsersProducts(LoginRequiredMixin, generic.ListView):
     def get_queryset(self):
         contact = Contact.objects.get(user=self.request.user)
 
-        return Product.objects.filter(contact=contact)
+        wohnprojekte = Wohnprojekt.objects.filter(contact=contact)
+        mobilitaetsprojekte = MobilitaetsProjekt.objects.filter(contact=contact)
+        ernaehrungsprojekte = ErnaehrungsProjekt.objects.filter(contact=contact)
+        energyprojekte = EnergyProjekt.objects.filter(contact=contact)
+
+        projekte = list(itertools.chain(wohnprojekte, mobilitaetsprojekte, ernaehrungsprojekte, energyprojekte))
+
+        return projekte
 
     def get_context_data(self, **kwargs):
-            context = super().get_context_data(**kwargs)
-            contact = Contact.objects.get(user=self.request.user)
+        context = super().get_context_data(**kwargs)
+        contact = Contact.objects.get(user=self.request.user)
 
-            context['user'] = self.request.user
-            return context
+        context['user'] = self.request.user
+        return context
 
 class MediaView(LoginRequiredMixin, TemplateView):
     template_name = 'marktplatz/media_overview.html'