From 7c866e11e4bd8ed6a54efba7c3a2922706575f45 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 3 Sep 2011 14:36:01 +0200
Subject: [PATCH] Removed ItemPoll and ItemFormPoll.

---
 openslides/agenda/forms.py | 14 +-------------
 openslides/agenda/views.py |  6 ------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/openslides/agenda/forms.py b/openslides/agenda/forms.py
index 530a7fa80..69f761e75 100644
--- a/openslides/agenda/forms.py
+++ b/openslides/agenda/forms.py
@@ -13,7 +13,7 @@
 from django.forms import Form, ModelForm, IntegerField, ChoiceField, \
                          ModelChoiceField, HiddenInput, Select
 from django.utils.translation import ugettext as _
-from openslides.agenda.models import Item, ItemText, ItemApplication, ItemPoll, \
+from openslides.agenda.models import Item, ItemText, ItemApplication, \
                                      ItemAssignment
 
 class ItemFormText(ModelForm):
@@ -37,17 +37,6 @@ class ItemFormApplication(ModelForm):
         exclude = ('closed', 'weight')
 
 
-class ItemFormPoll(ModelForm):
-    error_css_class = 'error'
-    required_css_class = 'required'
-    items = Item.objects.all().filter(parent=None).order_by('weight')
-    parent = ModelChoiceField(queryset=items, label=_("Parent item"), required=False)
-
-    class Meta:
-        model = ItemPoll
-        exclude = ('closed', 'weight')
-
-
 class ItemFormAssignment(ModelForm):
     error_css_class = 'error'
     required_css_class = 'required'
@@ -77,6 +66,5 @@ class ElementOrderForm(Form):
 MODELFORM = {
     'ItemText': ItemFormText,
     'ItemApplication': ItemFormApplication,
-    'ItemPoll': ItemFormPoll,
     'ItemAssignment': ItemFormAssignment,
 }
diff --git a/openslides/agenda/views.py b/openslides/agenda/views.py
index 7b0ccb6fe..f7e8d69be 100644
--- a/openslides/agenda/views.py
+++ b/openslides/agenda/views.py
@@ -234,12 +234,6 @@ def edit(request, item_id=None, form='ItemText', default=None):
                     'application': application,
                     'title': application.title,
                 }
-            elif form == "ItemPoll":
-                poll = Poll.objects.get(pk=default)
-                initial = {
-                    'poll': poll,
-                    'title': poll.title,
-                }
 
         if item_id is None:
             form = MODELFORM[form](initial=initial)