Fixed bugs introduced in last commit

This commit is contained in:
Raphael Michel
2016-05-07 14:53:23 +02:00
parent 38f1a43f31
commit c0da0db59c
5 changed files with 7 additions and 5 deletions
@@ -4,7 +4,7 @@
{% block title %}{% trans "Attendees" %}{% endblock %}
{% block content %}
<h1>{% trans "Attendees" %}</h1>
{% if attendees|length == 0 %}
{% if not filtered and attendees|length == 0 %}
<div class="empty-collection">
<p>
{% blocktrans trimmed %}
@@ -4,7 +4,7 @@
{% block title %}{% trans "Orders" %}{% endblock %}
{% block content %}
<h1>{% trans "Orders" %}</h1>
{% if questions|length == 0 %}
{% if not filtered and orders|length == 0 %}
<div class="empty-collection">
<p>
{% blocktrans trimmed %}
+1
View File
@@ -27,4 +27,5 @@ class AttendeeList(EventPermissionRequiredMixin, ListView):
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
ctx['items'] = Item.objects.filter(event=self.request.event, admission=True)
ctx['filtered'] = ("status" in self.request.GET or "item" in self.request.GET)
return ctx
+1
View File
@@ -58,6 +58,7 @@ class OrderList(EventPermissionRequiredMixin, ListView):
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
ctx['items'] = Item.objects.filter(event=self.request.event)
ctx['filtered'] = ("status" in self.request.GET or "item" in self.request.GET or "user" in self.request.GET)
return ctx
+3 -3
View File
@@ -100,7 +100,7 @@ class CategoriesTest(ItemFormTest):
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper table").text)
self.assertNotIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper").text)
assert not ItemCategory.objects.filter(id=c.id).exists()
@@ -138,7 +138,7 @@ class QuestionsTest(ItemFormTest):
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("shoe size", self.driver.find_element_by_css_selector("#page-wrapper table").text)
self.assertNotIn("shoe size", self.driver.find_element_by_css_selector("#page-wrapper").text)
assert not Question.objects.filter(id=c.id).exists()
@@ -186,5 +186,5 @@ class QuotaTest(ItemFormTest):
))
self.driver.find_element_by_class_name("btn-danger").click()
self.driver.find_element_by_class_name("alert-success")
self.assertNotIn("Full house", self.driver.find_element_by_css_selector("#page-wrapper table").text)
self.assertNotIn("Full house", self.driver.find_element_by_css_selector("#page-wrapper").text)
assert not Quota.objects.filter(id=c.id).exists()