From 4045c79a179c3388efce1db849f69620abf435e7 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 2 Apr 2012 08:31:26 +0200
Subject: [PATCH] #80: Merged fix of r362 from default branch into 1.2-dev
 branch.

---
 .../participant/templates/participant/overview.html | 13 +++++++++----
 openslides/participant/views.py                     |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 44bbaca10..6436a97c7 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -11,20 +11,20 @@
         {% csrf_token %}
         {%trans "Filter" %}:
         <select class="default-input" name="gender" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Gender" %}--</option>
+            <option value="---">-- {%trans "Gender" %} --</option>
             <option value="male" {% if 'male' in sortfilter.gender %}selected{% endif %}>{%trans "Male" %}</option>
             <option value="female" {% if 'female' in sortfilter.gender %}selected{% endif %}>{%trans "Female" %}</option>
             <option value="" {% if '' in sortfilter.gender %}selected{% endif %}>{%trans "Not specified" %}</option>
         </select>
         <select class="default-input" name="group" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Group" %}--</option>
+            <option value="---">-- {%trans "Group" %} --</option>
             {% for group in groups %}
                 <option value="{{ group }}" {% if group in sortfilter.group %}selected{% endif %}>
                 {{ group }}</option>
             {% endfor %}
         </select>
         <select class="default-input" name="type" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Type" %}--</option>
+            <option value="---">-- {%trans "Type" %} --</option>
             <option value="delegate" {% if 'delegate' in sortfilter.type %}selected{% endif %}>{%trans "Delegate" %}</option>
             <option value="observer" {% if 'observer' in sortfilter.type %}selected{% endif %}>{%trans "Observer" %}</option>
             <option value="staff" {% if 'staff' in sortfilter.type %}selected{% endif %}>{%trans "Staff" %}</option>
@@ -32,12 +32,17 @@
             <option value="" {% if '' in sortfilter.type %}selected{% endif %}>{%trans "Not specified" %}</option>
         </select>
         <select class="default-input" name="committee" onchange="document.forms['filter'].submit()">
-            <option value="---">-- {%trans "Committee" %}--</option>
+            <option value="---">-- {%trans "Committee" %} --</option>
             {% for committee in committees %}
                 <option value="{{ committee }}" {% if committee in sortfilter.committee %}selected{% endif %}>
                 {{ committee }}</option>
             {% endfor %}
         </select>
+        <select class="default-input" name="status" onchange="document.forms['filter'].submit()">
+            <option value="---">-- {%trans "Status" %} --</option>
+            <option value="1" {% if '1' in sortfilter.status %}selected{% endif %}>{%trans "Active" %}</option>
+            <option value="0" {% if '0' in sortfilter.status %}selected{% endif %}>{%trans "Inactive" %}</option>
+        </select>
         </form>
     </p>
     {{ users|length }} {% trans "Participant" %}
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index b4c6ee9b6..b5d06309e 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -61,7 +61,7 @@ def get_overview(request):
     except KeyError:
         sortfilter = {}
 
-    for value in [u'gender', u'group', u'type', u'committee', u'sort', u'reverse']:
+    for value in [u'gender', u'group', u'type', u'committee', u'status', u'sort', u'reverse']:
         if value in request.REQUEST:
             if request.REQUEST[value] == '---':
                 try:
@@ -80,6 +80,8 @@ def get_overview(request):
         query = query.filter(profile__type__iexact=sortfilter['type'][0])
     if 'committee' in sortfilter:
         query = query.filter(profile__committee__iexact=sortfilter['committee'][0])
+    if 'status' in sortfilter:
+        query = query.filter(is_active=sortfilter['status'][0])
     if 'sort' in sortfilter:
         if sortfilter['sort'][0] in ['first_name', 'last_name','username','last_login','email']:
             query = query.order_by(sortfilter['sort'][0])