From 834851acbdd744a4bd6751aa48db6ed0b5fd9b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Thu, 4 Jul 2013 15:01:08 +0200
Subject: [PATCH 1/2] Typo in assignment view (fixed #805)

---
 .../assignment/templates/assignment/view.html |  2 +-
 tests/assignment/test_views.py                | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 8cd2141e8..d381f6857 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -121,7 +121,7 @@
     {% endif %}
 {% endif %}
 
-{% if perms.assignment.can_manage_assignments and blocked_candidates and assignment.status != "fin" %}
+{% if perms.assignment.can_manage_assignment and blocked_candidates and assignment.status != "fin" %}
     <h4>{% trans "Blocked Candidates" %}</h4>
     <ul>
     {% for person in blocked_candidates %}
diff --git a/tests/assignment/test_views.py b/tests/assignment/test_views.py
index cad0d0f7e..7d3285ea5 100644
--- a/tests/assignment/test_views.py
+++ b/tests/assignment/test_views.py
@@ -64,3 +64,29 @@ class TestAssignmentPollDelete(AssignmentViewTestCase):
     def test_post(self):
         response = self.admin_client.post('/assignment/poll/1/del/', {'yes': 1})
         self.assertRedirects(response, '/assignment/1/')
+
+
+class TestAssignmentDetailView(AssignmentViewTestCase):
+    def test_blocked_candidates_view(self):
+        """
+        Tests that a delegate runs for a vote and then withdraws himself.
+        """
+        response = self.staff_client.get('/assignment/1/')
+        self.assertContains(response, 'No candidates available.')
+        self.assertNotContains(response, 'Blocked Candidates')
+
+        response = self.delegate_client.get('/assignment/1/run/')
+        self.assertTrue(self.assignment1.is_candidate(self.delegate))
+        self.assertFalse(self.assignment1.is_blocked(self.delegate))
+
+        response = self.staff_client.get('/assignment/1/')
+        self.assertNotContains(response, 'No candidates available.')
+        self.assertNotContains(response, 'Blocked Candidates')
+
+        response = self.delegate_client.get('/assignment/1/delrun/')
+        self.assertFalse(self.assignment1.is_candidate(self.delegate))
+        self.assertTrue(self.assignment1.is_blocked(self.delegate))
+
+        response = self.staff_client.get('/assignment/1/')
+        self.assertContains(response, 'No candidates available.')
+        self.assertContains(response, 'Blocked Candidates')

From d226c5f8527ba9ba795d8f2077a32c9c4eeb0efe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?= <my-git-mail@normanjaeckel.de>
Date: Thu, 4 Jul 2013 15:34:40 +0200
Subject: [PATCH 2/2] Update windows installing instruction (fixed #792)

---
 INSTALL.txt | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/INSTALL.txt b/INSTALL.txt
index 735b63df6..81b3dd22d 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -26,7 +26,7 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
         E. g. for Ubuntu run:
         $ sudo apt-get install python-dev
 
-  2. Setup a virtual environment with virtualenv (optional):
+  2. Setup a virtual environment with Virtual Python Environment builder (optional):
 
         You can setup a virtual environment to install OpenSlides as
         non-root user.
@@ -117,7 +117,7 @@ III. Installation on GNU/Linux and MacOSX using the sources (for development)
         $ sudo apt-get install git
         $ git clone git://github.com/OpenSlides/OpenSlides.git
 
-  3. Setup a virtual environment with virtualenv (optional):
+  3. Setup a virtual environment with Virtual Python Environment builder (optional):
 
         You can setup a virtual environment to install OpenSlides as
         non-root user.
@@ -176,21 +176,29 @@ portable version you should run the following install steps.
 
      a) Download and run 32bit MSI installer from http://www.python.org/:
 
-        http://python.org/ftp/python/2.7.4/python-2.7.4.msi
+        http://www.python.org/ftp/python/2.7.5/python-2.7.5.msi
 
      b) Add python dirs to PATH (via Control Panel > System > Advanced):
 
         ";C:\Python27;C:\Python27\Scripts"
 
-     c) Download and run 32bit binary installer from http://pypi.python.org/pypi/setuptools:
+        Note that the path can differ if you customized the install of
+        Python in step a).
 
-        https://pypi.python.org/packages/2.7/s/setuptools/setuptools-0.6c11.win32-py2.7.exe
+     c) Download the install script ez_setup.py for Setuptools 0.7.7 from
+        https://pypi.python.org/pypi/setuptools/0.7.7#windows and run (via
+        double click).
 
-  2. Setup a virtual environment with virtualenv (optional):
+  2. Setup a virtual environment with Virtual Python Environment builder (optional):
 
         You can setup a virtual environment to install OpenSlides as
         non-root user.
 
+        To install Virtual Python Environment builder, open command line
+        (cmd) and run:
+
+        > easy_install https://pypi.python.org/packages/source/v/virtualenv/virtualenv-1.9.1.tar.gz
+
         To setup and activate the virtual environment, create your
         OpenSlides directory, open command line (cmd), change to the
         directory and run:
@@ -202,7 +210,7 @@ portable version you should run the following install steps.
 
         Run on command line (cmd):
 
-        > pip install openslides
+        > easy_install openslides
 
         OpenSlides will install all required python packages.