From 4ffb7013978e6bf88db21f6685d88f7de661b583 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 00:11:53 +0200
Subject: [PATCH 01/23] created new user-api

---
 openslides/application/forms.py               |   7 +-
 openslides/application/models.py              |   3 +-
 .../templates/application/view.html           |   6 +-
 openslides/application/views.py               |  16 +-
 openslides/participant/models.py              |  45 +++++-
 openslides/utils/user/__init__.py             | 141 ++++++++++++++++++
 openslides/utils/user/signals.py              |  15 ++
 7 files changed, 214 insertions(+), 19 deletions(-)
 create mode 100644 openslides/utils/user/__init__.py
 create mode 100644 openslides/utils/user/signals.py

diff --git a/openslides/application/forms.py b/openslides/application/forms.py
index 2d4bf5518..9da1f3a83 100644
--- a/openslides/application/forms.py
+++ b/openslides/application/forms.py
@@ -15,6 +15,7 @@ from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
 from openslides.utils.forms import CssClassMixin
+from openslides.utils.user import UserFormField
 from openslides.application.models import Application
 
 
@@ -50,11 +51,7 @@ class ApplicationFormTrivialChanges(ApplicationForm):
 
 
 class ApplicationManagerForm(forms.ModelForm, CssClassMixin):
-    submitter = UserModelChoiceField(
-        queryset=User.objects.all().exclude(profile=None).
-        order_by("first_name"),
-        label=_("Submitter"),
-    )
+    submitter = UserFormField()
 
     class Meta:
         model = Application
diff --git a/openslides/application/models.py b/openslides/application/models.py
index c06b4716e..e0d8b738b 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -21,6 +21,7 @@ from django.utils.translation import pgettext
 from django.utils.translation import ugettext_lazy as _, ugettext_noop, ugettext
 
 from openslides.utils.utils import _propper_unicode
+from openslides.utils.user import UserField
 
 from openslides.config.models import config
 from openslides.config.signals import default_config_value
@@ -60,7 +61,7 @@ class Application(models.Model, SlideMixin):
         # genpoll
     )
 
-    submitter = models.ForeignKey(User, verbose_name=_("Submitter"))
+    submitter = UserField(verbose_name=_("Submitter"))
     supporter = models.ManyToManyField(User, related_name='supporter', \
                                        null=True, blank=True, verbose_name=_("Supporters"))
     number = models.PositiveSmallIntegerField(blank=True, null=True,
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index 0ae213ab0..dd9ad9c69 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -16,8 +16,8 @@
 <div id="sidebar">
     <div class="box">
     <h4>{% trans "Submitter" %}:</h4>
-    {{ application.submitter.profile }}
-    {% if user == application.submitter %}
+    {{ application.submitter }}
+    {% if user == application.submitter.user %}
     <img src="{% static 'images/icons/user-information.png' %}" title="{% trans 'You!' %}">
     {% endif %}
 
@@ -113,7 +113,7 @@
     {{ application.creation_time }}
 
     <p></p>
-    {% if "wit" in actions and user == application.submitter %}
+    {% if "wit" in actions and user == application.submitter.user %}
     <p></p>
         <a href='{% url application_set_status application.id 'wit' %}'>
             <span class="button"><span class="icon revert">{% trans 'Withdraw' %}</span></span>
diff --git a/openslides/application/views.py b/openslides/application/views.py
index 8e8fd39c7..6154abb13 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -180,7 +180,7 @@ def edit(request, application_id=None):
         return redirect(reverse('application_overview'))
     if application_id is not None:
         application = Application.objects.get(id=application_id)
-        if not request.user == application.submitter and not is_manager:
+        if not request.user == application.submitter.user and not is_manager:
             messages.error(request, _("You can not edit this application. You are not the submitter."))
             return redirect(reverse('application_view', args=[application.id]))
         actions = application.get_allowed_actions(user=request.user)
@@ -217,7 +217,7 @@ def edit(request, application_id=None):
                         original_supporters.append(s)
                 application = managerform.save(commit=False)
             elif application_id is None:
-                application = Application(submitter=request.user)
+                application = Application(submitter=request.user.profile)
             application.title = dataform.cleaned_data['title']
             application.text = dataform.cleaned_data['text']
             application.reason = dataform.cleaned_data['reason']
@@ -278,12 +278,14 @@ def edit(request, application_id=None):
         dataform = formclass(initial=initial, prefix="data")
         if is_manager:
             if application_id is None:
-                initial = {'submitter': str(request.user.id)}
+                try:
+                    initial = {'submitter': request.user.profile.uid}
+                except Profile.DoesNotExist:
+                    initial = {}
             else:
-                initial = {}
-            managerform = managerformclass(initial=initial, \
-                                                 instance=application, \
-                                                 prefix="manager")
+                initial = {'submitter': application.submitter.uid}
+            managerform = managerformclass(initial=initial,
+                instance=application, prefix="manager")
         else:
             managerform = None
     return {
diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index 46c7e56b0..d892b38e2 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -10,19 +10,22 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from django.db import models
 from django.db.models import Q
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
+from openslides.utils.user import UserMixin
+from openslides.utils.user.signals import receiv_users
+
 from openslides.config.signals import default_config_value
 
 from openslides.participant.api import gen_password
 
 
-
-class Profile(models.Model):
+class Profile(models.Model, UserMixin):
+    user_prefix = 'participant'
     GENDER_CHOICES = (
         ('male', _('Male')),
         ('female', _('Female')),
@@ -86,6 +89,42 @@ class Profile(models.Model):
         )
 
 
+class ParticipantUsers(object):
+    user_prefix = Profile.user_prefix
+
+    def __iter__(self):
+        for profile in Profile.objects.all():
+            yield profile
+
+    def __getitem__(self, key):
+        return Profile.objects.get(pk=key)
+
+
+class DjangoGroup(models.Model, UserMixin):
+    user_prefix = 'djangogroup'
+
+    group = models.OneToOneField(Group)
+
+    def __unicode__(self):
+        return unicode(self.group)
+
+
+class DjangoGroupUsers(object):
+    user_prefix = DjangoGroup.user_prefix
+
+    def __iter__(self):
+        for group in DjangoGroup.objects.all():
+            yield group
+
+    def __getitem__(self, key):
+        return DjangoGroup.objects.get(pk=key)
+
+
+@receiver(receiv_users, dispatch_uid="participant_profile")
+def receiv_users(sender, **kwargs):
+    return [ParticipantUsers(), DjangoGroupUsers()]
+
+
 @receiver(default_config_value, dispatch_uid="participant_default_config")
 def default_config(sender, key, **kwargs):
     """
diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
new file mode 100644
index 000000000..ef539926a
--- /dev/null
+++ b/openslides/utils/user/__init__.py
@@ -0,0 +1,141 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.user.api
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Useful functions for the user object.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django.db import models
+from django import forms
+
+from openslides.utils.user.signals import receiv_users
+
+
+class UserChoices():
+    def __init__(self, field):
+        self.field = field
+
+    def __iter__(self):
+        if self.field.empty_label is not None:
+            yield (u"", self.field.empty_label)
+        for user in Users():
+            yield (user.uid, user)
+
+
+class UserFormField(forms.fields.ChoiceField):
+    def __init__(self, required=True, initial=None, empty_label=u"---------", *args, **kwargs):
+
+        if required and (initial is not None):
+            self.empty_label = None
+        else:
+            self.empty_label = empty_label
+        #TODO use a own self.choices property, see ModelChoiceField
+        super(UserFormField, self).__init__(choices=UserChoices(field=self), required=required, initial=initial, *args, **kwargs)
+
+    def to_python(self, value):
+        print value
+        return get_user(value)
+
+    def valid_value(self, value):
+        return super(UserFormField, self).valid_value(value.uid)
+
+
+class UserField(models.fields.Field):
+    __metaclass__ = models.SubfieldBase
+
+    def __init__(self, *args, **kwargs):
+        super(UserField, self).__init__(max_length=255, *args, **kwargs)
+        # TODO: Validate the uid
+
+    def get_internal_type(self):
+        return "CharField"
+
+    def to_python(self, value):
+        """
+        Convert string value to a User Object.
+        """
+        if hasattr(value, 'uid'):
+            user =  value
+        else:
+            user = get_user(value)
+
+        user.prepare_database_save = lambda unused: UserField().get_prep_value(user)
+        return user
+
+    def get_prep_value(self, value):
+        return value.uid
+
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+        return self.get_prep_value(value)
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': UserFormField}
+        defaults.update(kwargs)
+        return super(UserField, self).formfield(**defaults)
+
+
+def split_uid(uid):
+    data = uid.split(':', 1)
+    if len(data) == 2 and data[0] and data[1]:
+        return data
+    raise TypeError("Invalid uid: '%s'" % uid)
+
+
+def get_user(uid):
+    try:
+        user_type, id = split_uid(uid)
+    except TypeError:
+        return EmtyUser()
+
+    for receiver, users_list in receiv_users.send(sender='get_user'):
+        for users in users_list:
+            if users.user_prefix == user_type:
+                return users[id]
+    # TODO: Use own Exception
+    raise Exception('User with uid %s does not exist' % uid)
+
+
+class Users(object):
+    """
+    A Storage for a multiplicity of different User-Objects.
+    """
+    def __iter__(self):
+        for receiver, users_list in receiv_users.send(sender='users'):
+            for users in users_list:
+                # Does iter(users) work?
+                print users
+                for user in users:
+                    print user
+                    yield user
+
+
+def generate_uid(prefix, id):
+    if ':' in prefix:
+        # TODO: Use the right Error.
+        raise Exception("':' is not allowed in a the 'user_prefix'")
+    return "%s:%d" % (prefix, id)
+
+
+# TODO: I dont need this object any more
+class UserMixin(object):
+    @property
+    def uid(self):
+        try:
+            return generate_uid(self.user_prefix, self.id)
+        except AttributeError:
+            raise AttributeError("%s has to have a attribute 'user_prefix'" % self)
+
+    def __repr__(self):
+        return 'User: %s' % self.uid
+
+
+class EmtyUser(UserMixin):
+    @property
+    def uid(self):
+        return 'emtyuser'
diff --git a/openslides/utils/user/signals.py b/openslides/utils/user/signals.py
new file mode 100644
index 000000000..8f1b1c20d
--- /dev/null
+++ b/openslides/utils/user/signals.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.user.signals
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Defines Signals for the user.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django.dispatch import Signal
+
+receiv_users = Signal(providing_args=[])

From 93020f9ead098a27390eef55e240f58f65a7bd1a Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 12:44:34 +0200
Subject: [PATCH 02/23] mark group to be teated as user

---
 openslides/application/views.py   |  4 +++-
 openslides/assignment/forms.py    |  4 ++--
 openslides/participant/forms.py   |  3 +++
 openslides/participant/views.py   | 24 ++++++++++++++++++++++--
 openslides/utils/user/__init__.py |  7 +------
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/openslides/application/views.py b/openslides/application/views.py
index 6154abb13..f9a92a5f5 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -180,7 +180,9 @@ def edit(request, application_id=None):
         return redirect(reverse('application_overview'))
     if application_id is not None:
         application = Application.objects.get(id=application_id)
-        if not request.user == application.submitter.user and not is_manager:
+        if (not hasattr(application.submitter, 'user') or
+            not request.user == application.submitter.user) \
+            and not is_manager:
             messages.error(request, _("You can not edit this application. You are not the submitter."))
             return redirect(reverse('application_view', args=[application.id]))
         actions = application.get_allowed_actions(user=request.user)
diff --git a/openslides/assignment/forms.py b/openslides/assignment/forms.py
index 839e53422..07c06fc02 100644
--- a/openslides/assignment/forms.py
+++ b/openslides/assignment/forms.py
@@ -14,6 +14,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
 from openslides.utils.forms import CssClassMixin
+from openslides.utils.user import UserFormField
 
 from openslides.participant.models import Profile
 from openslides.assignment.models import Assignment
@@ -29,9 +30,8 @@ class AssignmentForm(forms.ModelForm, CssClassMixin):
 
 
 class AssignmentRunForm(forms.Form, CssClassMixin):
-    candidate = forms.ModelChoiceField(
+    candidate = UserFormField(
         widget=forms.Select(attrs={'class': 'medium-input'}),
-        queryset=Profile.objects.all().order_by('user__first_name'),
         label=_("Nominate a participant"),
     )
 
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 972f3b27c..2d33bb960 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -68,6 +68,9 @@ class ProfileForm(forms.ModelForm, CssClassMixin):
 
 
 class GroupForm(forms.ModelForm, CssClassMixin):
+    as_user = forms.BooleanField(initial=False, required=False,
+        label=_("Treat Group as User"),
+        help_text=_("The Group will appear on any place, other user does."))
     permissions = LocalizedModelMultipleChoiceField(
         queryset=Permission.objects.all(), label=_("Persmissions"))
 
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 5b7c237ab..35ae94c4d 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -46,7 +46,7 @@ from openslides.utils.views import FormView, PDFView
 
 from openslides.config.models import config
 
-from openslides.participant.models import Profile
+from openslides.participant.models import Profile, DjangoGroup
 from openslides.participant.api import gen_username, gen_password
 from openslides.participant.forms import (UserNewForm, UserEditForm,
     ProfileForm, UsersettingsForm, UserImportForm, GroupForm,
@@ -269,6 +269,7 @@ def group_edit(request, group_id=None):
         try:
             group = Group.objects.get(id=group_id)
         except Group.DoesNotExist:
+            # TODO: return a 404 Object
             raise NameError("There is no group %d" % group_id)
     else:
         group = None
@@ -277,14 +278,18 @@ def group_edit(request, group_id=None):
     if request.method == 'POST':
         form = GroupForm(request.POST, instance=group)
         if form.is_valid():
+            # TODO: This can be done inside the form
             group_name = form.cleaned_data['name'].lower()
 
+            # TODO: Why is this code called on any request and not only, if the
+            # anonymous_group is edited?
             try:
                 anonymous_group = Group.objects.get(name='Anonymous')
             except Group.DoesNotExist:
                 anonymous_group = None
 
             # special handling for anonymous auth
+            # TODO: This code should be a form validator.
             if group is None and group_name.strip().lower() == 'anonymous':
                 # don't allow to create this group
                 messages.error(request,
@@ -296,6 +301,16 @@ def group_edit(request, group_id=None):
                 }
 
             group = form.save()
+            try:
+                django_group = DjangoGroup.objects.get(group=group)
+            except DjangoGroup.DoesNotExist:
+                django_group = None
+            if form.cleaned_data['as_user'] and django_group is None:
+                DjangoGroup(group=group).save()
+            elif not form.cleaned_data['as_user'] and django_group:
+                django_group.delete()
+
+
             if anonymous_group is not None and \
                anonymous_group.id == group.id:
                 # prevent name changes -
@@ -315,7 +330,12 @@ def group_edit(request, group_id=None):
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:
-        form = GroupForm(instance=group)
+        if group and DjangoGroup.objects.filter(group=group).exists():
+            initial = {'as_user': True}
+        else:
+            initial = {'as_user': False}
+
+        form = GroupForm(instance=group, initial=initial)
     return {
         'form': form,
         'group': group,
diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index ef539926a..229ada3c4 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -16,7 +16,7 @@ from django import forms
 from openslides.utils.user.signals import receiv_users
 
 
-class UserChoices():
+class UserChoices(object):
     def __init__(self, field):
         self.field = field
 
@@ -29,7 +29,6 @@ class UserChoices():
 
 class UserFormField(forms.fields.ChoiceField):
     def __init__(self, required=True, initial=None, empty_label=u"---------", *args, **kwargs):
-
         if required and (initial is not None):
             self.empty_label = None
         else:
@@ -38,7 +37,6 @@ class UserFormField(forms.fields.ChoiceField):
         super(UserFormField, self).__init__(choices=UserChoices(field=self), required=required, initial=initial, *args, **kwargs)
 
     def to_python(self, value):
-        print value
         return get_user(value)
 
     def valid_value(self, value):
@@ -109,9 +107,7 @@ class Users(object):
         for receiver, users_list in receiv_users.send(sender='users'):
             for users in users_list:
                 # Does iter(users) work?
-                print users
                 for user in users:
-                    print user
                     yield user
 
 
@@ -122,7 +118,6 @@ def generate_uid(prefix, id):
     return "%s:%d" % (prefix, id)
 
 
-# TODO: I dont need this object any more
 class UserMixin(object):
     @property
     def uid(self):

From 4f61c763d73c861976613654d4ac8090d02f8a9b Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 13:49:05 +0200
Subject: [PATCH 03/23] started to rewrite the assignment-code for the new
 user-api

---
 openslides/assignment/models.py               | 46 +++++++++++++------
 .../assignment/templates/assignment/view.html | 15 +++---
 openslides/assignment/urls.py                 |  2 +-
 openslides/assignment/views.py                | 23 ++++++----
 4 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index 5598ad73f..6036c5e5a 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -15,6 +15,8 @@ from django.db import models
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
+from openslides.utils.user import UserField
+
 from openslides.config.models import config
 from openslides.config.signals import default_config_value
 
@@ -29,6 +31,15 @@ from openslides.poll.models import (BasePoll, CountInvalid, CountVotesCast,
 from openslides.agenda.models import Item
 
 
+class AssignmentCandidate(models.Model):
+    assignment = models.ForeignKey("Assignment")
+    user = UserField(unique=True, db_index=True)
+    elected = models.BooleanField(default=False)
+
+    def __unicode__(self):
+        return unicode(self.user)
+
+
 class Assignment(models.Model, SlideMixin):
     prefix = 'assignment'
     STATUS = (
@@ -44,11 +55,16 @@ class Assignment(models.Model, SlideMixin):
         verbose_name=_("Number of available posts"))
     polldescription = models.CharField(max_length=100, null=True, blank=True,
         verbose_name=_("Comment on the ballot paper"))
-    profile = models.ManyToManyField(Profile, null=True, blank=True)
-    elected = models.ManyToManyField(Profile, null=True, blank=True,
-        related_name='elected_set')
     status = models.CharField(max_length=3, choices=STATUS, default='sea')
 
+    @property
+    def profile(self):
+        return AssignmentCandidate.objects.filter(assignment=self).filter(elected=False)
+
+    @property
+    def elected(self):
+        return AssignmentCandidate.objects.filter(assignment=self).filter(elected=True)
+
     def set_status(self, status):
         error = True
         for a, b in Assignment.STATUS:
@@ -71,29 +87,31 @@ class Assignment(models.Model, SlideMixin):
             raise NameError(_('<b>%s</b> is already a candidate.') % profile)
         if not user.has_perm("assignment.can_manage_assignment") and self.status != 'sea':
             raise NameError(_('The candidate list is already closed.'))
-        self.profile.add(profile)
+        AssignmentCandidate(assignment=self, user=profile, elected=False).save()
 
-    def delrun(self, profile, user=None):
+    def delrun(self, user):
         """
         stop running for a vote
         """
-        if not user.has_perm("assignment.can_manage_assignment") and self.status != 'sea':
-            raise NameError(_('The candidate list is already closed.'))
-        if self.is_candidate(profile):
-            self.profile.remove(profile)
-            self.elected.remove(profile)
+        if self.status != 'sea':
+            # TODO: Use an OpenSlides Error
+            raise Exception(_('The candidate list is already closed.'))
+        if self.is_candidate(user):
+            AssignmentCandidate.objects.get(user=user).delete()
         else:
-            raise NameError(_('%s is no candidate') % profile)
+            # TODO: Use an OpenSlides Error
+            raise Exception(_('%s is no candidate') % user)
 
-    def is_candidate(self, profile):
-        if profile in self.profile.get_query_set():
+    def is_candidate(self, user):
+        if AssignmentCandidate.objects.filter(user=user).exists():
             return True
         else:
             return False
 
     @property
     def candidates(self):
-        return self.profile.get_query_set()
+        for candidate in AssignmentCandidate.objects.filter(assignment=self).filter(elected=False):
+            yield candidate.user
 
 
     def set_elected(self, profile, value=True):
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 5f3530a0d..d8bae2e12 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -35,13 +35,14 @@
 
     <h3>{% trans "Candidates" %}</h3>
     <ol>
-    {% for profile in assignment.profile.all|dictsort:"user.first_name" %}
-        <li>{{ profile }}
-        {% if perms.assignment.can_manage_assignment %}
-        {% if assignment.status == "sea" or assignment.status == "vot" %}
-        <a href="{% url assignment_delother assignment.id profile.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
-        {% endif %}
-        {% endif %}
+    {% for user in assignment.candidates %}
+        <li>
+            {{ user }}
+            {% if perms.assignment.can_manage_assignment %}
+                {% if assignment.status == "sea" or assignment.status == "vot" %}
+                    <a href="{% url assignment_delother assignment.id user.uid %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
+                {% endif %}
+            {% endif %}
         </li>
     {% empty %}
         <li style="list-style: none outside none;"><i>{% trans "No candidates available." %}</i></li>
diff --git a/openslides/assignment/urls.py b/openslides/assignment/urls.py
index 0b6e63798..0c6b1050f 100644
--- a/openslides/assignment/urls.py
+++ b/openslides/assignment/urls.py
@@ -55,7 +55,7 @@ urlpatterns = patterns('openslides.assignment.views',
         name='assignment_delrun',
     ),
 
-    url(r'^(?P<assignment_id>\d+)/delother/(?P<profile_id>\d+)/$',
+    url(r'^(?P<assignment_id>\d+)/delother/(?P<user_id>[^/]+)/$',
         'delother',
         name='assignment_delother',
     ),
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 03bd55516..8a0aa7efc 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -30,6 +30,7 @@ from openslides.utils.template import Tab
 from openslides.utils.utils import (template, permission_required,
     gen_confirm_form, del_confirm_form, ajax_request)
 from openslides.utils.views import FormView, DeleteView, PDFView, RedirectView
+from openslides.utils.user import get_user
 
 from openslides.config.models import config
 from openslides.participant.models import Profile
@@ -182,28 +183,30 @@ def run(request, assignment_id):
 def delrun(request, assignment_id):
     assignment = Assignment.objects.get(pk=assignment_id)
     try:
-        assignment.delrun(request.user.profile, request.user)
-        messages.success(request, _("You have withdrawn your candidature successfully.") )
-    except NameError, e:
+        assignment.delrun(request.user.profile)
+    except Exception, e:
         messages.error(request, e)
+    else:
+        messages.success(request, _("You have withdrawn your candidature successfully.") )
     return redirect(reverse('assignment_view', args=[assignment_id]))
 
 
 @permission_required('assignment.can_manage_assignment')
-def delother(request, assignment_id, profile_id):
+def delother(request, assignment_id, user_id):
     assignment = Assignment.objects.get(pk=assignment_id)
-    profile = Profile.objects.get(pk=profile_id)
+    user = get_user(user_id)
 
     if request.method == 'POST':
         try:
-            assignment.delrun(profile, request.user)
-            messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (profile))
-        except NameError, e:
+            assignment.delrun(user)
+        except Exception, e:
             messages.error(request, e)
+        else:
+            messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (user))
     else:
         gen_confirm_form(request,
-                       _("Do you really want to withdraw <b>%s</b> from the election?") \
-                        % profile, reverse('assignment_delother', args=[assignment_id, profile_id]))
+           _("Do you really want to withdraw <b>%s</b> from the election?") \
+            % user, reverse('assignment_delother', args=[assignment_id, user_id]))
     return redirect(reverse('assignment_view', args=[assignment_id]))
 
 

From 1ae91d113063d6d0155059329f19c0e570dafd60 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 14:23:13 +0200
Subject: [PATCH 04/23] changed user-api, so it can be filter the result for
 the prefix and the id

---
 openslides/participant/models.py  | 36 ++++++++++++++++---------------
 openslides/utils/user/__init__.py | 27 ++++++++++++-----------
 openslides/utils/user/signals.py  |  2 +-
 3 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index d892b38e2..fe19ff9de 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -89,17 +89,6 @@ class Profile(models.Model, UserMixin):
         )
 
 
-class ParticipantUsers(object):
-    user_prefix = Profile.user_prefix
-
-    def __iter__(self):
-        for profile in Profile.objects.all():
-            yield profile
-
-    def __getitem__(self, key):
-        return Profile.objects.get(pk=key)
-
-
 class DjangoGroup(models.Model, UserMixin):
     user_prefix = 'djangogroup'
 
@@ -109,20 +98,33 @@ class DjangoGroup(models.Model, UserMixin):
         return unicode(self.group)
 
 
-class DjangoGroupUsers(object):
-    user_prefix = DjangoGroup.user_prefix
+class ParticipantUsers(object):
+    def __init__(self, user_prefix=None, id=None):
+        self.user_prefix = user_prefix
+        self.id = id
 
     def __iter__(self):
-        for group in DjangoGroup.objects.all():
-            yield group
+        if not self.user_prefix or self.user_prefix == Profile.user_prefix:
+            if self.id:
+                yield Profile.objects.get(pk=self.id)
+            else:
+                for profile in Profile.objects.all():
+                    yield profile
+
+        if not self.user_prefix or self.user_prefix == DjangoGroup.user_prefix:
+            if self.id:
+                yield DjangoGroup.objects.get(pk=self.id)
+            else:
+                for group in DjangoGroup.objects.all():
+                    yield group
 
     def __getitem__(self, key):
-        return DjangoGroup.objects.get(pk=key)
+        return Profile.objects.get(pk=key)
 
 
 @receiver(receiv_users, dispatch_uid="participant_profile")
 def receiv_users(sender, **kwargs):
-    return [ParticipantUsers(), DjangoGroupUsers()]
+    return ParticipantUsers(user_prefix=kwargs['user_prefix'], id=kwargs['id'])
 
 
 @receiver(default_config_value, dispatch_uid="participant_default_config")
diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index 229ada3c4..d65ebb21a 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -87,28 +87,31 @@ def split_uid(uid):
 
 def get_user(uid):
     try:
-        user_type, id = split_uid(uid)
+        user_prefix, id = split_uid(uid)
     except TypeError:
         return EmtyUser()
 
-    for receiver, users_list in receiv_users.send(sender='get_user'):
-        for users in users_list:
-            if users.user_prefix == user_type:
-                return users[id]
-    # TODO: Use own Exception
-    raise Exception('User with uid %s does not exist' % uid)
+    return Users(user_prefix=user_prefix, id=id)[0]
 
 
 class Users(object):
     """
     A Storage for a multiplicity of different User-Objects.
     """
+    def __init__(self, user_prefix=None, id=None):
+        self.user_prefix = user_prefix
+        self.id = id
+
     def __iter__(self):
-        for receiver, users_list in receiv_users.send(sender='users'):
-            for users in users_list:
-                # Does iter(users) work?
-                for user in users:
-                    yield user
+        for receiver, users in receiv_users.send(sender='users', user_prefix=self.user_prefix, id=self.id):
+            # Does iter(users) work?
+            for user in users:
+                yield user
+
+    def __getitem__(self, key):
+        user_list = list(self)
+        print user_list
+        return user_list[key]
 
 
 def generate_uid(prefix, id):
diff --git a/openslides/utils/user/signals.py b/openslides/utils/user/signals.py
index 8f1b1c20d..5779db7ab 100644
--- a/openslides/utils/user/signals.py
+++ b/openslides/utils/user/signals.py
@@ -12,4 +12,4 @@
 
 from django.dispatch import Signal
 
-receiv_users = Signal(providing_args=[])
+receiv_users = Signal(providing_args=['user_prefix', 'id'])

From c16d38d9a35afc7a4537497ddafd52e643be2dcd Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 16:25:04 +0200
Subject: [PATCH 05/23] user-api: Load the User-List from UserFormField on any
 request

---
 openslides/utils/user/__init__.py | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index d65ebb21a..3a77a827d 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -33,8 +33,22 @@ class UserFormField(forms.fields.ChoiceField):
             self.empty_label = None
         else:
             self.empty_label = empty_label
-        #TODO use a own self.choices property, see ModelChoiceField
-        super(UserFormField, self).__init__(choices=UserChoices(field=self), required=required, initial=initial, *args, **kwargs)
+        forms.fields.Field.__init__(self, required=required, initial=initial, *args, **kwargs)
+        self.widget.choices = self.choices
+
+    def __deepcopy__(self, memo):
+        result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
+        return result
+
+
+    def _get_choices(self):
+        # If self._choices is set, then somebody must have manually set
+        # the property self.choices. In this case, just return self._choices.
+        if hasattr(self, '_choices'):
+            return self._choices
+        return UserChoices(self)
+
+    choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
 
     def to_python(self, value):
         return get_user(value)
@@ -104,19 +118,17 @@ class Users(object):
 
     def __iter__(self):
         for receiver, users in receiv_users.send(sender='users', user_prefix=self.user_prefix, id=self.id):
-            # Does iter(users) work?
             for user in users:
                 yield user
 
     def __getitem__(self, key):
         user_list = list(self)
-        print user_list
         return user_list[key]
 
 
 def generate_uid(prefix, id):
     if ':' in prefix:
-        # TODO: Use the right Error.
+        # TODO: Use the right Exception.
         raise Exception("':' is not allowed in a the 'user_prefix'")
     return "%s:%d" % (prefix, id)
 
@@ -125,7 +137,7 @@ class UserMixin(object):
     @property
     def uid(self):
         try:
-            return generate_uid(self.user_prefix, self.id)
+            return generate_uid(self.user_prefix, self.pk)
         except AttributeError:
             raise AttributeError("%s has to have a attribute 'user_prefix'" % self)
 

From 8fcf65e8297f8155cace8bee0b4d8ec50171c35b Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 18:56:00 +0200
Subject: [PATCH 06/23] user-api: make the assignments work with the new
 user-api

---
 openslides/assignment/models.py               | 75 ++++++++++---------
 .../assignment/templates/assignment/view.html | 16 ++--
 openslides/assignment/urls.py                 |  4 +-
 openslides/assignment/views.py                | 14 ++--
 4 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index 6036c5e5a..bc48dcd31 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -33,7 +33,7 @@ from openslides.agenda.models import Item
 
 class AssignmentCandidate(models.Model):
     assignment = models.ForeignKey("Assignment")
-    user = UserField(unique=True, db_index=True)
+    user = UserField(db_index=True)
     elected = models.BooleanField(default=False)
 
     def __unicode__(self):
@@ -57,14 +57,6 @@ class Assignment(models.Model, SlideMixin):
         verbose_name=_("Comment on the ballot paper"))
     status = models.CharField(max_length=3, choices=STATUS, default='sea')
 
-    @property
-    def profile(self):
-        return AssignmentCandidate.objects.filter(assignment=self).filter(elected=False)
-
-    @property
-    def elected(self):
-        return AssignmentCandidate.objects.filter(assignment=self).filter(elected=True)
-
     def set_status(self, status):
         error = True
         for a, b in Assignment.STATUS:
@@ -97,45 +89,59 @@ class Assignment(models.Model, SlideMixin):
             # TODO: Use an OpenSlides Error
             raise Exception(_('The candidate list is already closed.'))
         if self.is_candidate(user):
-            AssignmentCandidate.objects.get(user=user).delete()
+            assignment_candidats.get(user=user).delete()
         else:
             # TODO: Use an OpenSlides Error
             raise Exception(_('%s is no candidate') % user)
 
     def is_candidate(self, user):
-        if AssignmentCandidate.objects.filter(user=user).exists():
+        if self.assignment_candidats.filter(user=user).exists():
             return True
         else:
             return False
 
+    @property
+    def assignment_candidats(self):
+        return AssignmentCandidate.objects.filter(assignment=self)
+
     @property
     def candidates(self):
-        for candidate in AssignmentCandidate.objects.filter(assignment=self).filter(elected=False):
-            yield candidate.user
+        return self.get_participants(only_candidate=True)
+
+    @property
+    def elected(self):
+        return self.get_participants(only_elected=True)
+
+    def get_participants(self, only_elected=False, only_candidate=False):
+        candidates = self.assignment_candidats
+
+        if only_elected and only_candidate:
+            # TODO: Use right Exception
+            raise Exception("only_elected and only_candidate can not both be Treu")
+
+        if only_elected:
+            candidates = candidates.filter(elected=True)
+
+        if only_candidate:
+            candidates = candidates.filter(elected=False)
+
+        return [candidate.user for candidate in candidates]
+        #for candidate in candidates:
+        #    yield candidate.user
 
 
-    def set_elected(self, profile, value=True):
-        if profile in self.candidates:
-            if value and not self.is_elected(profile):
-                self.elected.add(profile)
-            elif not value:
-                self.elected.remove(profile)
+    def set_elected(self, user, value=True):
+        candidate = AssignmentCandidate.objects.get(user=user)
+        candidate.elected = value
+        candidate.save()
 
-    def is_elected(self, profile):
-        if profile in self.elected.all():
-            return True
-        return False
+    def is_elected(self, user):
+        return user in self.elected
 
     def gen_poll(self):
         poll = AssignmentPoll(assignment=self)
         poll.save()
-        candidates = list(self.profile.all())
-        for elected in self.elected.all():
-            try:
-                candidates.remove(elected)
-            except ValueError:
-                pass
-        poll.set_options([{'candidate': profile} for profile in candidates])
+        poll.set_options([{'candidate': user} for user in self.candidates])
         return poll
 
 
@@ -177,6 +183,7 @@ class Assignment(models.Model, SlideMixin):
         return self.name
 
     def delete(self):
+        # Remove any Agenda-Item, which is related to this application.
         for item in Item.objects.filter(related_sid=self.sid):
             item.delete()
         super(Assignment, self).delete()
@@ -224,7 +231,7 @@ class AssignmentVote(BaseVote):
 
 class AssignmentOption(BaseOption):
     poll = models.ForeignKey('AssignmentPoll')
-    candidate = models.ForeignKey(Profile)
+    candidate = UserField()
     vote_class = AssignmentVote
 
     def __unicode__(self):
@@ -248,8 +255,8 @@ class AssignmentPoll(BasePoll, CountInvalid, CountVotesCast, PublishPollMixin):
                 self.yesnoabstain = True
             else:
                 # candidates <= available posts -> yes/no/abstain
-                if self.assignment.candidates.count() <= (self.assignment.posts
-                        - self.assignment.elected.count()):
+                if self.assignment.assignment_candidats.filter(elected=False).count() <= (self.assignment.posts
+                        - self.assignment.assignment_candidats.filter(elected=True).count()):
                     self.yesnoabstain = True
                 else:
                     self.yesnoabstain = False
@@ -278,8 +285,6 @@ class AssignmentPoll(BasePoll, CountInvalid, CountVotesCast, PublishPollMixin):
         return _("Ballot %d") % self.get_ballot()
 
 
-
-
 @receiver(default_config_value, dispatch_uid="assignment_default_config")
 def default_config(sender, key, **kwargs):
     return {
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index d8bae2e12..9a60c96db 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -124,7 +124,7 @@
                 {% endif %}
             </th>
         {% endfor %}
-        {% if assignment.profile.exists and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
             <th>
                 <a href='{% url assignment_gen_poll assignment.id %}'>
                     <span class="button">
@@ -138,9 +138,9 @@
     {% for candidate, poll_list in vote_results.items %}
     <tr class="{% cycle 'odd' '' %}">
         <td class="candidate">
-            {% if candidate in assignment.elected.all %}
+            {% if candidate in assignment.elected %}
                 {% if perms.assignment.can_manage_assignment %}
-                    <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.id %}'></a>
+                    <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.uid %}'></a>
                 {% else %}
                     <a class="elected">
                         <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
@@ -148,7 +148,7 @@
                 {% endif %}
             {% else %}
                 {% if perms.assignment.can_manage_assignment %}
-                    <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.id %}'></a>
+                    <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.uid %}'></a>
                 {% endif %}
             {% endif %}
             {{ candidate }}
@@ -168,7 +168,7 @@
                 {% endif %}
             </td>
         {% endfor %}
-        {% if assignment.profile.exists and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
             <td></td>
         {% endif %}
     </tr>
@@ -186,7 +186,7 @@
                 </td>
             {% endif %}
         {% endfor %}
-        {% if assignment.profile.exists and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
             <td></td>
         {% endif %}
     </tr>
@@ -203,7 +203,7 @@
                 </td>
             {% endif %}
         {% endfor %}
-        {% if assignment.profile.exists and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+        {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
             <td></td>
         {% endif %}
     </tr>
@@ -213,7 +213,7 @@
 
     <i>{% trans "No ballots available." %}</i>
 
-    {% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+    {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
         <p><a href='{% url assignment_gen_poll assignment.id %}'>
         <span class="button">
            <span class="icon statistics">{% trans 'New ballot' %}</span>
diff --git a/openslides/assignment/urls.py b/openslides/assignment/urls.py
index 0c6b1050f..5540b8a06 100644
--- a/openslides/assignment/urls.py
+++ b/openslides/assignment/urls.py
@@ -105,13 +105,13 @@ urlpatterns = patterns('openslides.assignment.views',
         name='assignment_poll_publish_status',
     ),
 
-    url(r'^(?P<assignment_id>\d+)/elected/(?P<profile_id>\d+)/$',
+    url(r'^(?P<assignment_id>\d+)/elected/(?P<user_id>[^/]+)/$',
         'set_elected',
         {'elected': True},
         name='assignment_user_elected',
     ),
 
-    url(r'^(?P<assignment_id>\d+)/notelected/(?P<profile_id>\d+)/$',
+    url(r'^(?P<assignment_id>\d+)/notelected/(?P<user_id>[^/]+)/$',
         'set_elected',
         {'elected': False},
         name='assignment_user_not_elected',
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 8a0aa7efc..350bf0e19 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -266,21 +266,19 @@ def set_publish_status(request, poll_id):
 
 
 @permission_required('assignment.can_manage_assignment')
-def set_elected(request, assignment_id, profile_id, elected=True):
+def set_elected(request, assignment_id, user_id, elected=True):
     assignment = Assignment.objects.get(pk=assignment_id)
-    profile = Profile.objects.get(pk=profile_id)
-    assignment.set_elected(profile, elected)
+    user = get_user(user_id)
+    assignment.set_elected(user, elected)
 
     if request.is_ajax():
         if elected:
-            link = reverse('assignment_user_not_elected', args=[assignment.id, profile.id])
+            link = reverse('assignment_user_not_elected', args=[assignment.id, user.uid])
             text = _('not elected')
         else:
-            link = reverse('assignment_user_elected', args=[assignment.id, profile.id])
+            link = reverse('assignment_user_elected', args=[assignment.id, user.uid])
             text = _('elected')
-        return ajax_request({'elected': elected,
-                             'link': link,
-                             'text': text})
+        return ajax_request({'elected': elected, 'link': link, 'text': text})
 
     return redirect(reverse('assignment_view', args=[assignment_id]))
 

From 2bc2dad7a5e36c14ed52e57bfeee8470390f03d4 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Fri, 3 Aug 2012 19:15:14 +0200
Subject: [PATCH 07/23] user-api: small fix for the second poll in assignment

---
 openslides/assignment/models.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index bc48dcd31..6f7fbf169 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -131,7 +131,7 @@ class Assignment(models.Model, SlideMixin):
 
 
     def set_elected(self, user, value=True):
-        candidate = AssignmentCandidate.objects.get(user=user)
+        candidate = self.assignment_candidats.get(user=user)
         candidate.elected = value
         candidate.save()
 
@@ -255,8 +255,7 @@ class AssignmentPoll(BasePoll, CountInvalid, CountVotesCast, PublishPollMixin):
                 self.yesnoabstain = True
             else:
                 # candidates <= available posts -> yes/no/abstain
-                if self.assignment.assignment_candidats.filter(elected=False).count() <= (self.assignment.posts
-                        - self.assignment.assignment_candidats.filter(elected=True).count()):
+                if self.assignment.assignment_candidats.filter(elected=False).count() <= (self.assignment.posts):
                     self.yesnoabstain = True
                 else:
                     self.yesnoabstain = False

From 14bf6d0a35235bbc1c54fe78aa7ca408bbeb7dff Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 4 Aug 2012 12:19:31 +0200
Subject: [PATCH 08/23] user-api: updated the application-supporter system to
 new user-api

---
 openslides/application/forms.py               |   9 +-
 openslides/application/models.py              |  61 ++++++----
 .../templates/application/view.html           |  20 ++--
 openslides/application/views.py               | 110 ++++++++----------
 openslides/participant/api.py                 |  11 ++
 openslides/participant/forms.py               |   1 +
 openslides/participant/models.py              |  26 ++++-
 openslides/utils/user/__init__.py             |  17 +++
 8 files changed, 152 insertions(+), 103 deletions(-)

diff --git a/openslides/application/forms.py b/openslides/application/forms.py
index 9da1f3a83..34a7ef9b9 100644
--- a/openslides/application/forms.py
+++ b/openslides/application/forms.py
@@ -15,7 +15,7 @@ from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
 from openslides.utils.forms import CssClassMixin
-from openslides.utils.user import UserFormField
+from openslides.utils.user import UserFormField, MultipleUserFormField
 from openslides.application.models import Application
 
 
@@ -59,11 +59,8 @@ class ApplicationManagerForm(forms.ModelForm, CssClassMixin):
 
 
 class ApplicationManagerFormSupporter(ApplicationManagerForm):
-    supporter = UserModelMultipleChoiceField(
-        queryset=User.objects.all().exclude(profile=None).
-        order_by("first_name"),
-        required=False, label=_("Supporters"),
-    )
+    # TODO: Do not show the submitter in the user-list
+    supporter = MultipleUserFormField(required=False, label=_("Supporters"))
 
 
 class ApplicationImportForm(forms.Form, CssClassMixin):
diff --git a/openslides/application/models.py b/openslides/application/models.py
index e0d8b738b..4b45a5ed8 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -37,6 +37,11 @@ from openslides.projector.models import SlideMixin
 from openslides.agenda.models import Item
 
 
+class ApplicationSupporter(models.Model):
+    application = models.ForeignKey("Application")
+    user = UserField()
+
+
 class Application(models.Model, SlideMixin):
     prefix = "application"
     STATUS = (
@@ -62,8 +67,6 @@ class Application(models.Model, SlideMixin):
     )
 
     submitter = UserField(verbose_name=_("Submitter"))
-    supporter = models.ManyToManyField(User, related_name='supporter', \
-                                       null=True, blank=True, verbose_name=_("Supporters"))
     number = models.PositiveSmallIntegerField(blank=True, null=True,
                                         unique=True)
     status = models.CharField(max_length=3, choices=STATUS, default='pub')
@@ -158,6 +161,13 @@ class Application(models.Model, SlideMixin):
         else:
             return False
 
+    @property
+    def supporters(self):
+        return [object.user for object in self.applicationsupporter_set.all()]
+
+    def is_supporter(self, user):
+        return self.applicationsupporter_set.filter(user=user).exists()
+
     @property
     def enough_supporters(self):
         """
@@ -165,17 +175,20 @@ class Application(models.Model, SlideMixin):
         """
         min_supporters = int(config['application_min_supporters'])
         if self.status == "pub":
-            return self.supporter.count() >= min_supporters
+            return self.count_supporters() >= min_supporters
         else:
             return True
 
+    def count_supporters(self):
+        return self.applicationsupporter_set.count()
+
     @property
     def missing_supporters(self):
         """
         Return number of missing supporters
         """
         min_supporters = int(config['application_min_supporters'])
-        delta = min_supporters - self.supporter.count()
+        delta = min_supporters - self.count_supporters()
         if delta > 0:
             return delta
         else:
@@ -222,10 +235,11 @@ class Application(models.Model, SlideMixin):
         except AttributeError:
             is_manager = False
 
+        supporters = self.applicationsupporter_set.all()
         if (self.status == "pub"
-        and self.supporter.exists()
+        and supporters
         and not is_manager):
-            self.supporter.clear()
+            supporters.delete()
             self.writelog(_("Supporters removed"), user)
 
     def reset(self, user):
@@ -242,29 +256,36 @@ class Application(models.Model, SlideMixin):
         Add a Supporter to the list of supporters of the application.
         """
         if user == self.submitter:
+            # TODO: Use own Exception
             raise NameError('Supporter can not be the submitter of a ' \
                             'application.')
         if self.permitted is not None:
+            # TODO: Use own Exception
             raise NameError('This application is already permitted.')
-        if user not in self.supporter.all():
-            self.supporter.add(user)
-        self.writelog(_("Supporter: +%s") % (user))
+        if not self.is_supporter(user):
+            ApplicationSupporter(application=self, user=user).save()
+            self.writelog(_("Supporter: +%s") % (user))
 
     def unsupport(self, user):
         """
         remove a supporter from the list of supporters of the application
         """
         if self.permitted is not None:
+            # TODO: Use own Exception
             raise NameError('This application is already permitted.')
-        if user in self.supporter.all():
-            self.supporter.remove(user)
-        self.writelog(_("Supporter: -%s") % (user))
+        try:
+            object = self.applicationsupporter_set.get(user=user).delete()
+        except ApplicationSupporter.DoesNotExist:
+            pass
+        else:
+            self.writelog(_("Supporter: -%s") % (user))
 
     def set_number(self, number=None, user=None):
         """
         Set a number for ths application.
         """
         if self.number is not None:
+            # TODO: Use own Exception
             raise NameError('This application has already a number.')
         if number is None:
             try:
@@ -333,7 +354,7 @@ class Application(models.Model, SlideMixin):
         self.writelog(_("Status modified")+": %s -> %s" \
                       % (oldstatus, self.get_status_display()), user)
 
-    def get_allowed_actions(self, user=None):
+    def get_allowed_actions(self, user):
         """
         Return a list of all the allowed status.
         """
@@ -367,16 +388,12 @@ class Application(models.Model, SlideMixin):
             actions.append("pub")
 
         # Check if the user can support and unspoort the application
-        try:
-            if  (self.status == "pub"
-              and user != self.submitter
-              and user not in self.supporter.all()
-              and getattr(user, 'profile', None)):
-                actions.append("support")
-        except Profile.DoesNotExist:
-            pass
+        if  (self.status == "pub"
+          and user != self.submitter
+          and not self.is_supporter(user)):
+            actions.append("support")
 
-        if self.status == "pub" and user in self.supporter.all():
+        if self.status == "pub" and self.is_supporter(user):
             actions.append("unsupport")
 
         #Check if the user can edit the application
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index dd9ad9c69..183f76b50 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -22,16 +22,16 @@
     {% endif %}
 
     {% if min_supporters > 0 %}
-    <h4>{% trans "Supporters" %}: *</h4>
-    {% if application.supporter.count == 0 %}
-    -
-    {% else %}
-        <ol>
-        {% for supporter in application.supporter.all %}
-            <li> {{ supporter.profile }}</li>
-        {% endfor %}
-        </ol>
-    {% endif %}
+        <h4>{% trans "Supporters" %}: *</h4>
+        {% if not application.supporters %}
+        -
+        {% else %}
+            <ol>
+            {% for supporter in application.supporters %}
+                <li> {{ supporter }}</li>
+            {% endfor %}
+            </ol>
+        {% endif %}
     {% endif %}
 
     <h4>{% trans "Status" %}:</h4>
diff --git a/openslides/application/views.py b/openslides/application/views.py
index f9a92a5f5..f4d06cab9 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -42,6 +42,7 @@ from openslides.utils.template import Tab
 from openslides.utils.utils import (template, permission_required,
     del_confirm_form, gen_confirm_form)
 from openslides.utils.views import PDFView, RedirectView, DeleteView, FormView
+from openslides.utils.user import get_user
 
 from openslides.config.models import config
 
@@ -49,7 +50,7 @@ from openslides.projector.projector import Widget
 
 from openslides.poll.views import PollFormView
 
-from openslides.participant.api import gen_username, gen_password
+from openslides.participant.api import gen_username, gen_password, user2djangouser
 from openslides.participant.models import Profile
 
 from openslides.agenda.models import Item
@@ -123,7 +124,7 @@ def overview(request):
     for (i, application) in enumerate(applications):
         try:
             applications[i] = {
-                'actions'     : application.get_allowed_actions(request.user),
+                'actions'     : application.get_allowed_actions(user2djangouser(request.user)),
                 'application' : application
             }
         except:
@@ -151,7 +152,8 @@ def view(request, application_id, newest=False):
     else:
         version = application.public_version
     revisions = application.versions
-    actions = application.get_allowed_actions(user=request.user)
+    user = user2djangouser(request.user)
+    actions = application.get_allowed_actions(user=user)
 
     return {
         'application': application,
@@ -181,11 +183,11 @@ def edit(request, application_id=None):
     if application_id is not None:
         application = Application.objects.get(id=application_id)
         if (not hasattr(application.submitter, 'user') or
-            not request.user == application.submitter.user) \
+            not user2djangouser(request.user) == application.submitter.user) \
             and not is_manager:
             messages.error(request, _("You can not edit this application. You are not the submitter."))
             return redirect(reverse('application_view', args=[application.id]))
-        actions = application.get_allowed_actions(user=request.user)
+        actions = application.get_allowed_actions(user=user2djangouser(request.user))
     else:
         application = None
         actions = None
@@ -212,14 +214,14 @@ def edit(request, application_id=None):
 
         if valid:
             del_supporters = True
-            original_supporters = []
             if is_manager:
                 if application: # Edit application
-                    for s in application.supporter.all():
-                        original_supporters.append(s)
+                    original_supporters = list(application.supporters)
+                else:
+                    original_supporters = []
                 application = managerform.save(commit=False)
             elif application_id is None:
-                application = Application(submitter=request.user.profile)
+                application = Application(submitter=user2djangouser(request.user))
             application.title = dataform.cleaned_data['title']
             application.text = dataform.cleaned_data['text']
             application.reason = dataform.cleaned_data['reason']
@@ -229,30 +231,17 @@ def edit(request, application_id=None):
                     and dataform.cleaned_data['trivial_change']
             except KeyError:
                 trivial_change = False
-            application.save(request.user, trivial_change=trivial_change)
+            application.save(user2djangouser(request.user), trivial_change=trivial_change)
             if is_manager:
-                # log added supporters
-                supporters_added = []
-                for s in application.supporter.all():
-                    if s not in original_supporters:
-                        try:
-                            supporters_added.append(unicode(s.profile))
-                        except Profile.DoesNotExist:
-                            pass
-                if len(supporters_added) > 0:
-                    log_added = ", ".join(supporters_added)
-                    application.writelog(_("Supporter: +%s") % log_added, request.user)
-                # log removed supporters
-                supporters_removed = []
-                for s in original_supporters:
-                    if s not in application.supporter.all():
-                        try:
-                            supporters_removed.append(unicode(s.profile))
-                        except Profile.DoesNotExist:
-                            pass
-                if len(supporters_removed) > 0:
-                    log_removed = ", ".join(supporters_removed)
-                    application.writelog(_("Supporter: -%s") % log_removed, request.user)
+                # TODO: Deal with the case, that the form has no field 'supporters'
+                old_supporters = set(application.supporters)
+                new_supporters = set(managerform.cleaned_data['supporter'])
+                # add new supporters
+                for supporter in new_supporters.difference(old_supporters):
+                    application.support(supporter)
+                # remove old supporters
+                for supporter in old_supporters.difference(new_supporters):
+                    application.unsupport(supporter)
             if application_id is None:
                 messages.success(request, _('New application was successfully created.'))
             else:
@@ -268,11 +257,11 @@ def edit(request, application_id=None):
         if application_id is None:
             initial = {'text': config['application_preamble']}
         else:
-            if application.status == "pub" and application.supporter.exists():
+            if application.status == "pub" and application.supporters:
                 if request.user.has_perm('application.can_manage_application'):
                     messages.warning(request, _("Attention: Do you really want to edit this application? The supporters will <b>not</b> be removed automatically because you can manage applications. Please check if the supports are valid after your changing!"))
                 else:
-                    messages.warning(request, _("Attention: Do you really want to edit this application? All <b>%s</b> supporters will be removed! Try to convince the supporters again.") % application.supporter.count() )
+                    messages.warning(request, _("Attention: Do you really want to edit this application? All <b>%s</b> supporters will be removed! Try to convince the supporters again.") % len(application.supporters) )
             initial = {'title': application.title,
                        'text': application.text,
                        'reason': application.reason}
@@ -280,12 +269,10 @@ def edit(request, application_id=None):
         dataform = formclass(initial=initial, prefix="data")
         if is_manager:
             if application_id is None:
-                try:
-                    initial = {'submitter': request.user.profile.uid}
-                except Profile.DoesNotExist:
-                    initial = {}
+                initial = {'submitter': user2djangouser(request.user).uid}
             else:
                 initial = {'submitter': application.submitter.uid}
+            initial['supporter'] = [supporter.uid for supporter in application.supporters]
             managerform = managerformclass(initial=initial,
                 instance=application, prefix="manager")
         else:
@@ -305,7 +292,7 @@ def set_number(request, application_id):
     set a number for an application.
     """
     try:
-        Application.objects.get(pk=application_id).set_number(user=request.user)
+        Application.objects.get(pk=application_id).set_number(user=user2djangouser(request.user))
         messages.success(request, _("Application number was successfully set."))
     except Application.DoesNotExist:
         pass
@@ -321,7 +308,7 @@ def permit(request, application_id):
     permit an application.
     """
     try:
-        Application.objects.get(pk=application_id).permit(user=request.user)
+        Application.objects.get(pk=application_id).permit(user=user2djangouser(request.user))
         messages.success(request, _("Application was successfully permitted."))
     except Application.DoesNotExist:
         pass
@@ -336,7 +323,7 @@ def notpermit(request, application_id):
     reject (not permit) an application.
     """
     try:
-        Application.objects.get(pk=application_id).notpermit(user=request.user)
+        Application.objects.get(pk=application_id).notpermit(user=user2djangouser(request.user))
         messages.success(request, _("Application was successfully rejected."))
     except Application.DoesNotExist:
         pass
@@ -352,7 +339,7 @@ def set_status(request, application_id=None, status=None):
     try:
         if status is not None:
             application = Application.objects.get(pk=application_id)
-            application.set_status(user=request.user, status=status)
+            application.set_status(user=user2djangouser(request.user), status=status)
             messages.success(request, _("Application status was set to: <b>%s</b>.") % application.get_status_display())
     except Application.DoesNotExist:
         pass
@@ -368,7 +355,7 @@ def reset(request, application_id):
     reset an application.
     """
     try:
-        Application.objects.get(pk=application_id).reset(user=request.user)
+        Application.objects.get(pk=application_id).reset(user=user2djangouser(request.user))
         messages.success(request, _("Application status was reset.") )
     except Application.DoesNotExist:
         pass
@@ -382,7 +369,7 @@ def support(request, application_id):
     support an application.
     """
     try:
-        Application.objects.get(pk=application_id).support(user=request.user)
+        Application.objects.get(pk=application_id).support(user=user2djangouser(request.user))
         messages.success(request, _("You have support the application successfully.") )
     except Application.DoesNotExist:
         pass
@@ -396,7 +383,7 @@ def unsupport(request, application_id):
     unsupport an application.
     """
     try:
-        Application.objects.get(pk=application_id).unsupport(user=request.user)
+        Application.objects.get(pk=application_id).unsupport(user=user2djangouser(request.user))
         messages.success(request, _("You have unsupport the application successfully.") )
     except Application.DoesNotExist:
         pass
@@ -410,7 +397,7 @@ def gen_poll(request, application_id):
     gen a poll for this application.
     """
     try:
-        poll = Application.objects.get(pk=application_id).gen_poll(user=request.user)
+        poll = Application.objects.get(pk=application_id).gen_poll(user=user2djangouser(request.user))
         messages.success(request, _("New vote was successfully created.") )
     except Application.DoesNotExist:
         pass # TODO: do not call poll after this excaption
@@ -427,7 +414,7 @@ def delete_poll(request, poll_id):
     count = application.polls.filter(id__lte=poll_id).count()
     if request.method == 'POST':
         poll.delete()
-        application.writelog(_("Poll deleted"), request.user)
+        application.writelog(_("Poll deleted"), user2djangouser(request.user))
         messages.success(request, _('Poll was successfully deleted.'))
     else:
         del_confirm_form(request, poll, name=_("the %s. poll") % count, delete_link=reverse('application_poll_delete', args=[poll_id]))
@@ -467,7 +454,7 @@ class ApplicationDelete(DeleteView):
 
         if len(self.applications):
             for application in self.applications:
-                if not 'delete' in application.get_allowed_actions(user=request.user):
+                if not 'delete' in application.get_allowed_actions(user=user2djangouser(request.user)):
                     messages.error(request, _("You can not delete application <b>%s</b>.") % application)
                     continue
 
@@ -476,12 +463,12 @@ class ApplicationDelete(DeleteView):
                 messages.success(request, _("Application <b>%s</b> was successfully deleted.") % title)
 
         elif self.object:
-                if not 'delete' in self.object.get_allowed_actions(user=request.user):
-                    messages.error(request, _("You can not delete application <b>%s</b>.") % self.object)
-                else:
-                    title = self.object.title
-                    self.object.delete(force=True)
-                    messages.success(request, _("Application <b>%s</b> was successfully deleted.") % title)
+            if not 'delete' in self.object.get_allowed_actions(user=user2djangouser(request.user)):
+                messages.error(request, _("You can not delete application <b>%s</b>.") % self.object)
+            else:
+                title = self.object.title
+                self.object.delete(force=True)
+                messages.success(request, _("Application <b>%s</b> was successfully deleted.") % title)
         else:
             messages.error(request, _("Invalid request"))
 
@@ -517,12 +504,12 @@ class ViewPoll(PollFormView):
         self.application = self.poll.get_application()
         context['application'] = self.application
         context['ballot'] = self.poll.get_ballot()
-        context['actions'] = self.application.get_allowed_actions(user=self.request.user)
+        context['actions'] = self.application.get_allowed_actions(user=user2djangouser(self.request.user))
         return context
 
     def get_modelform_class(self):
         cls = super(ViewPoll, self).get_modelform_class()
-        user = self.request.user
+        user = user2djangouser(self.request.user)
 
         class ViewPollFormClass(cls):
             def save(self, commit = True):
@@ -544,7 +531,7 @@ def permit_version(request, aversion_id):
     aversion = AVersion.objects.get(pk=aversion_id)
     application = aversion.application
     if request.method == 'POST':
-        application.accept_version(aversion, user = request.user)
+        application.accept_version(aversion, user=user2djangouser(request.user))
         messages.success(request, _("Version <b>%s</b> accepted.") % (aversion.aid))
     else:
         gen_confirm_form(request, _('Do you really want to permit version <b>%s</b>?') % aversion.aid, reverse('application_version_permit', args=[aversion.id]))
@@ -556,7 +543,7 @@ def reject_version(request, aversion_id):
     aversion = AVersion.objects.get(pk=aversion_id)
     application = aversion.application
     if request.method == 'POST':
-        if application.reject_version(aversion, user = request.user):
+        if application.reject_version(aversion, user=user2djangouser(request.user)):
             messages.success(request, _("Version <b>%s</b> rejected.") % (aversion.aid))
         else:
             messages.error(request, _("ERROR by rejecting the version.") )
@@ -570,13 +557,14 @@ def reject_version(request, aversion_id):
 def application_import(request):
     try:
         request.user.profile
-        messages.error(request, _('The import function is available for the admin (without user profile) only.'))
-        return redirect(reverse('application_overview'))
     except Profile.DoesNotExist:
         pass
     except AttributeError:
         # AnonymousUser
         pass
+    else:
+        messages.error(request, _('The import function is available for the admin (without user profile) only.'))
+        return redirect(reverse('application_overview'))
 
     if request.method == 'POST':
         form = ApplicationImportForm(request.POST, request.FILES)
@@ -771,7 +759,7 @@ class ApplicationPDF(PDFView):
 
             cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset id='counter'>" % _("Supporters"), stylesheet['Heading4']))
 
-            for s in application.supporter.all():
+            for supporter in application.supporters:
                 cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(s.profile), stylesheet['Signaturefield']))
             if application.status == "pub":
                 for x in range(0,application.missing_supporters):
diff --git a/openslides/participant/api.py b/openslides/participant/api.py
index 3dde39c14..77104b98b 100644
--- a/openslides/participant/api.py
+++ b/openslides/participant/api.py
@@ -15,6 +15,9 @@ import string
 
 from django.contrib.auth.models import User
 
+from openslides.utils.user import get_user
+from openslides.participant.models import Profile
+
 
 def gen_password():
     """
@@ -44,3 +47,11 @@ def gen_username(first_name, last_name):
             User.objects.get(username=testname)
         except User.DoesNotExist:
             return testname
+
+
+def user2djangouser(user):
+    u = get_user('djangouser:%d' % user.id)
+    try:
+        return u.profile
+    except Profile.DoesNotExist:
+        return u
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 2d33bb960..610e17b2b 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -90,6 +90,7 @@ class UsersettingsForm(forms.ModelForm, CssClassMixin):
         model = User
         fields = ('username', 'first_name', 'last_name', 'email')
 
+
 class UserImportForm(forms.Form, CssClassMixin):
     csvfile = forms.FileField(widget=forms.FileInput(attrs={'size':'50'}),
         label=_("CSV File"))
diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index fe19ff9de..919e03b95 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -21,8 +21,6 @@ from openslides.utils.user.signals import receiv_users
 
 from openslides.config.signals import default_config_value
 
-from openslides.participant.api import gen_password
-
 
 class Profile(models.Model, UserMixin):
     user_prefix = 'participant'
@@ -53,7 +51,6 @@ class Profile(models.Model, UserMixin):
     firstpassword = models.CharField(max_length=100, null=True, blank=True,
         verbose_name = _("First Password"))
 
-
     def reset_password(self):
         """
         Reset the password for the user to his default-password.
@@ -61,7 +58,6 @@ class Profile(models.Model, UserMixin):
         self.user.set_password(self.firstpassword)
         self.user.save()
 
-
     @models.permalink
     def get_absolute_url(self, link='edit'):
         """
@@ -98,6 +94,17 @@ class DjangoGroup(models.Model, UserMixin):
         return unicode(self.group)
 
 
+class DjangoUser(User, UserMixin):
+    user_prefix = 'djangouser'
+
+    def has_no_profile(self):
+        # TODO: Make ths with a Manager, so it does manipulate the sql query
+        return not hasattr(self, 'profile')
+
+    class Meta:
+        proxy = True
+
+
 class ParticipantUsers(object):
     def __init__(self, user_prefix=None, id=None):
         self.user_prefix = user_prefix
@@ -118,6 +125,17 @@ class ParticipantUsers(object):
                 for group in DjangoGroup.objects.all():
                     yield group
 
+        if not self.user_prefix or self.user_prefix == DjangoUser.user_prefix:
+            if self.id:
+                yield DjangoUser.objects.get(pk=self.id)
+            else:
+                for user in DjangoUser.objects.all():
+                    if user.has_no_profile():
+                        yield user
+                    elif self.user_prefix:
+                        # If only users where requested, return the profile object.
+                        yield user.profile
+
     def __getitem__(self, key):
         return Profile.objects.get(pk=key)
 
diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index 3a77a827d..df711f6c6 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -57,6 +57,23 @@ class UserFormField(forms.fields.ChoiceField):
         return super(UserFormField, self).valid_value(value.uid)
 
 
+class MultipleUserFormField(UserFormField):
+    widget = forms.widgets.SelectMultiple
+
+    def __init__(self, *args, **kwargs):
+        super(MultipleUserFormField, self).__init__(empty_label=None, *args, **kwargs)
+
+    def to_python(self, value):
+        if hasattr(value, '__iter__'):
+            return [super(MultipleUserFormField, self).to_python(v) for v in value]
+        return super(MultipleUserFormField, self).to_python(value)
+
+    def valid_value(self, value):
+        if hasattr(value, '__iter__'):
+            return [super(MultipleUserFormField, self).valid_value(v) for v in value]
+        return super(MultipleUserFormField, self).valid_value(value)
+
+
 class UserField(models.fields.Field):
     __metaclass__ = models.SubfieldBase
 

From 8da09bb985ee6d1725552bef555a21703aa5801f Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 4 Aug 2012 12:46:32 +0200
Subject: [PATCH 09/23] user-api: fix an error with deactivated supporters in
 application

---
 openslides/application/views.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/openslides/application/views.py b/openslides/application/views.py
index f4d06cab9..f2c12645b 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -233,15 +233,19 @@ def edit(request, application_id=None):
                 trivial_change = False
             application.save(user2djangouser(request.user), trivial_change=trivial_change)
             if is_manager:
-                # TODO: Deal with the case, that the form has no field 'supporters'
-                old_supporters = set(application.supporters)
-                new_supporters = set(managerform.cleaned_data['supporter'])
-                # add new supporters
-                for supporter in new_supporters.difference(old_supporters):
-                    application.support(supporter)
-                # remove old supporters
-                for supporter in old_supporters.difference(new_supporters):
-                    application.unsupport(supporter)
+                try:
+                    new_supporters = set(managerform.cleaned_data['supporter'])
+                except KeyError:
+                    # The managerform has no field for the supporters
+                    pass
+                else:
+                    old_supporters = set(application.supporters)
+                    # add new supporters
+                    for supporter in new_supporters.difference(old_supporters):
+                        application.support(supporter)
+                    # remove old supporters
+                    for supporter in old_supporters.difference(new_supporters):
+                        application.unsupport(supporter)
             if application_id is None:
                 messages.success(request, _('New application was successfully created.'))
             else:
@@ -271,8 +275,8 @@ def edit(request, application_id=None):
             if application_id is None:
                 initial = {'submitter': user2djangouser(request.user).uid}
             else:
-                initial = {'submitter': application.submitter.uid}
-            initial['supporter'] = [supporter.uid for supporter in application.supporters]
+                initial = {'submitter': application.submitter.uid,
+                    'supporter': [supporter.uid for supporter in application.supporters]}
             managerform = managerformclass(initial=initial,
                 instance=application, prefix="manager")
         else:

From fe1ebf806a64389b582d76967d4d19101396c415 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 4 Aug 2012 12:51:07 +0200
Subject: [PATCH 10/23] user-api: Use the right Exception in get_user()

---
 openslides/utils/user/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index df711f6c6..0dbc44ce4 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -145,8 +145,7 @@ class Users(object):
 
 def generate_uid(prefix, id):
     if ':' in prefix:
-        # TODO: Use the right Exception.
-        raise Exception("':' is not allowed in a the 'user_prefix'")
+        raise ValueError("':' is not allowed in a the 'user_prefix'")
     return "%s:%d" % (prefix, id)
 
 

From 72e41fe286f92b29b701f5cf16ad20ec02f10b2d Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 4 Aug 2012 13:18:06 +0200
Subject: [PATCH 11/23] user-api: reorderd the user-api

---
 openslides/utils/user/__init__.py | 157 ++----------------------------
 openslides/utils/user/api.py      |  53 ++++++++++
 openslides/utils/user/forms.py    |  77 +++++++++++++++
 openslides/utils/user/model.py    |  65 +++++++++++++
 openslides/utils/user/models.py   |  73 ++++++++++++++
 5 files changed, 274 insertions(+), 151 deletions(-)
 create mode 100644 openslides/utils/user/api.py
 create mode 100644 openslides/utils/user/forms.py
 create mode 100644 openslides/utils/user/model.py
 create mode 100644 openslides/utils/user/models.py

diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index 0dbc44ce4..36c0e9b86 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -1,164 +1,19 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-    openslides.utils.user.api
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
+    openslides.utils.user
+    ~~~~~~~~~~~~~~~~~~~~~
 
-    Useful functions for the user object.
+    User api for OpenSlides
 
     :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
 
-from django.db import models
-from django import forms
-
 from openslides.utils.user.signals import receiv_users
-
-
-class UserChoices(object):
-    def __init__(self, field):
-        self.field = field
-
-    def __iter__(self):
-        if self.field.empty_label is not None:
-            yield (u"", self.field.empty_label)
-        for user in Users():
-            yield (user.uid, user)
-
-
-class UserFormField(forms.fields.ChoiceField):
-    def __init__(self, required=True, initial=None, empty_label=u"---------", *args, **kwargs):
-        if required and (initial is not None):
-            self.empty_label = None
-        else:
-            self.empty_label = empty_label
-        forms.fields.Field.__init__(self, required=required, initial=initial, *args, **kwargs)
-        self.widget.choices = self.choices
-
-    def __deepcopy__(self, memo):
-        result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
-        return result
-
-
-    def _get_choices(self):
-        # If self._choices is set, then somebody must have manually set
-        # the property self.choices. In this case, just return self._choices.
-        if hasattr(self, '_choices'):
-            return self._choices
-        return UserChoices(self)
-
-    choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
-
-    def to_python(self, value):
-        return get_user(value)
-
-    def valid_value(self, value):
-        return super(UserFormField, self).valid_value(value.uid)
-
-
-class MultipleUserFormField(UserFormField):
-    widget = forms.widgets.SelectMultiple
-
-    def __init__(self, *args, **kwargs):
-        super(MultipleUserFormField, self).__init__(empty_label=None, *args, **kwargs)
-
-    def to_python(self, value):
-        if hasattr(value, '__iter__'):
-            return [super(MultipleUserFormField, self).to_python(v) for v in value]
-        return super(MultipleUserFormField, self).to_python(value)
-
-    def valid_value(self, value):
-        if hasattr(value, '__iter__'):
-            return [super(MultipleUserFormField, self).valid_value(v) for v in value]
-        return super(MultipleUserFormField, self).valid_value(value)
-
-
-class UserField(models.fields.Field):
-    __metaclass__ = models.SubfieldBase
-
-    def __init__(self, *args, **kwargs):
-        super(UserField, self).__init__(max_length=255, *args, **kwargs)
-        # TODO: Validate the uid
-
-    def get_internal_type(self):
-        return "CharField"
-
-    def to_python(self, value):
-        """
-        Convert string value to a User Object.
-        """
-        if hasattr(value, 'uid'):
-            user =  value
-        else:
-            user = get_user(value)
-
-        user.prepare_database_save = lambda unused: UserField().get_prep_value(user)
-        return user
-
-    def get_prep_value(self, value):
-        return value.uid
-
-    def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
-        return self.get_prep_value(value)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': UserFormField}
-        defaults.update(kwargs)
-        return super(UserField, self).formfield(**defaults)
-
-
-def split_uid(uid):
-    data = uid.split(':', 1)
-    if len(data) == 2 and data[0] and data[1]:
-        return data
-    raise TypeError("Invalid uid: '%s'" % uid)
-
-
-def get_user(uid):
-    try:
-        user_prefix, id = split_uid(uid)
-    except TypeError:
-        return EmtyUser()
-
-    return Users(user_prefix=user_prefix, id=id)[0]
-
-
-class Users(object):
-    """
-    A Storage for a multiplicity of different User-Objects.
-    """
-    def __init__(self, user_prefix=None, id=None):
-        self.user_prefix = user_prefix
-        self.id = id
-
-    def __iter__(self):
-        for receiver, users in receiv_users.send(sender='users', user_prefix=self.user_prefix, id=self.id):
-            for user in users:
-                yield user
-
-    def __getitem__(self, key):
-        user_list = list(self)
-        return user_list[key]
-
-
-def generate_uid(prefix, id):
-    if ':' in prefix:
-        raise ValueError("':' is not allowed in a the 'user_prefix'")
-    return "%s:%d" % (prefix, id)
-
-
-class UserMixin(object):
-    @property
-    def uid(self):
-        try:
-            return generate_uid(self.user_prefix, self.pk)
-        except AttributeError:
-            raise AttributeError("%s has to have a attribute 'user_prefix'" % self)
-
-    def __repr__(self):
-        return 'User: %s' % self.uid
+from openslides.utils.user.api import generate_uid, split_uid, get_user, Users
+from openslides.utils.user.forms import UserFormField, MultipleUserFormField
+from openslides.utils.user.model import UserField, UserMixin
 
 
 class EmtyUser(UserMixin):
diff --git a/openslides/utils/user/api.py b/openslides/utils/user/api.py
new file mode 100644
index 000000000..13976aad8
--- /dev/null
+++ b/openslides/utils/user/api.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.user.api
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Usefull functions for the OpenSlides user api.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from openslides.utils.user.signals import receiv_users
+
+class Users(object):
+    """
+    A Storage for a multiplicity of different User-Objects.
+    """
+    def __init__(self, user_prefix=None, id=None):
+        self.user_prefix = user_prefix
+        self.id = id
+
+    def __iter__(self):
+        for receiver, users in receiv_users.send(
+                sender='users', user_prefix=self.user_prefix, id=self.id):
+            for user in users:
+                yield user
+
+    def __getitem__(self, key):
+        user_list = list(self)
+        return user_list[key]
+
+
+def generate_uid(prefix, id):
+    if ':' in prefix:
+        raise ValueError("':' is not allowed in a the 'user_prefix'")
+    return "%s:%d" % (prefix, id)
+
+
+def split_uid(uid):
+    data = uid.split(':', 1)
+    if len(data) == 2 and data[0] and data[1]:
+        return data
+    raise TypeError("Invalid uid: '%s'" % uid)
+
+
+def get_user(uid):
+    try:
+        user_prefix, id = split_uid(uid)
+    except TypeError:
+        return EmtyUser()
+
+    return Users(user_prefix=user_prefix, id=id)[0]
diff --git a/openslides/utils/user/forms.py b/openslides/utils/user/forms.py
new file mode 100644
index 000000000..436517a82
--- /dev/null
+++ b/openslides/utils/user/forms.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.user.forms
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Forms and FormFields for the OpenSlides user api.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django import forms
+
+from openslides.utils.user.api import Users, get_user
+
+class UserChoices(object):
+    def __init__(self, field):
+        self.field = field
+
+    def __iter__(self):
+        if self.field.empty_label is not None:
+            yield (u"", self.field.empty_label)
+        for user in Users():
+            yield (user.uid, user)
+
+
+class UserFormField(forms.fields.ChoiceField):
+    def __init__(self, required=True, initial=None, empty_label=u"---------",
+                 *args, **kwargs):
+        if required and (initial is not None):
+            self.empty_label = None
+        else:
+            self.empty_label = empty_label
+        forms.fields.Field.__init__(self, required=required, initial=initial,
+                                    *args, **kwargs)
+        self.widget.choices = self.choices
+
+    def __deepcopy__(self, memo):
+        result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
+        return result
+
+
+    def _get_choices(self):
+        # If self._choices is set, then somebody must have manually set
+        # the property self.choices. In this case, just return self._choices.
+        if hasattr(self, '_choices'):
+            return self._choices
+        return UserChoices(self)
+
+    choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
+
+    def to_python(self, value):
+        return get_user(value)
+
+    def valid_value(self, value):
+        return super(UserFormField, self).valid_value(value.uid)
+
+
+class MultipleUserFormField(UserFormField):
+    widget = forms.widgets.SelectMultiple
+
+    def __init__(self, *args, **kwargs):
+        super(MultipleUserFormField, self).__init__(empty_label=None,
+                                                    *args, **kwargs)
+
+    def to_python(self, value):
+        if hasattr(value, '__iter__'):
+            return [super(MultipleUserFormField, self).to_python(v)
+                    for v in value]
+        return super(MultipleUserFormField, self).to_python(value)
+
+    def valid_value(self, value):
+        if hasattr(value, '__iter__'):
+            return [super(MultipleUserFormField, self).valid_value(v)
+                    for v in value]
+        return super(MultipleUserFormField, self).valid_value(value)
diff --git a/openslides/utils/user/model.py b/openslides/utils/user/model.py
new file mode 100644
index 000000000..5c461da88
--- /dev/null
+++ b/openslides/utils/user/model.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.user.models
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Models and ModelFields for the OpenSlides user api.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django.db import models
+
+from openslides.utils.user.forms import UserFormField
+from openslides.utils.user.api import get_user, generate_uid
+
+
+class UserField(models.fields.Field):
+    __metaclass__ = models.SubfieldBase
+
+    def __init__(self, *args, **kwargs):
+        super(UserField, self).__init__(max_length=255, *args, **kwargs)
+        # TODO: Validate the uid
+
+    def get_internal_type(self):
+        return "CharField"
+
+    def to_python(self, value):
+        """
+        Convert string value to a User Object.
+        """
+        if hasattr(value, 'uid'):
+            user =  value
+        else:
+            user = get_user(value)
+
+        user.prepare_database_save = lambda unused: UserField() \
+                                                    .get_prep_value(user)
+        return user
+
+    def get_prep_value(self, value):
+        return value.uid
+
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+        return self.get_prep_value(value)
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': UserFormField}
+        defaults.update(kwargs)
+        return super(UserField, self).formfield(**defaults)
+
+
+class UserMixin(object):
+    @property
+    def uid(self):
+        try:
+            return generate_uid(self.user_prefix, self.pk)
+        except AttributeError:
+            raise AttributeError("%s has to have a attribute 'user_prefix'"
+                                 % self)
+
+    def __repr__(self):
+        return 'User: %s' % self.uid
diff --git a/openslides/utils/user/models.py b/openslides/utils/user/models.py
new file mode 100644
index 000000000..31a8a57c7
--- /dev/null
+++ b/openslides/utils/user/models.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.user.forms
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Forms and FormFields for the OpenSlides user api
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+class UserChoices(object):
+    def __init__(self, field):
+        self.field = field
+
+    def __iter__(self):
+        if self.field.empty_label is not None:
+            yield (u"", self.field.empty_label)
+        for user in Users():
+            yield (user.uid, user)
+
+
+class UserFormField(forms.fields.ChoiceField):
+    def __init__(self, required=True, initial=None, empty_label=u"---------",
+                 *args, **kwargs):
+        if required and (initial is not None):
+            self.empty_label = None
+        else:
+            self.empty_label = empty_label
+        forms.fields.Field.__init__(self, required=required, initial=initial,
+                                    *args, **kwargs)
+        self.widget.choices = self.choices
+
+    def __deepcopy__(self, memo):
+        result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
+        return result
+
+
+    def _get_choices(self):
+        # If self._choices is set, then somebody must have manually set
+        # the property self.choices. In this case, just return self._choices.
+        if hasattr(self, '_choices'):
+            return self._choices
+        return UserChoices(self)
+
+    choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
+
+    def to_python(self, value):
+        return get_user(value)
+
+    def valid_value(self, value):
+        return super(UserFormField, self).valid_value(value.uid)
+
+
+class MultipleUserFormField(UserFormField):
+    widget = forms.widgets.SelectMultiple
+
+    def __init__(self, *args, **kwargs):
+        super(MultipleUserFormField, self).__init__(empty_label=None,
+                                                    *args, **kwargs)
+
+    def to_python(self, value):
+        if hasattr(value, '__iter__'):
+            return [super(MultipleUserFormField, self).to_python(v)
+                    for v in value]
+        return super(MultipleUserFormField, self).to_python(value)
+
+    def valid_value(self, value):
+        if hasattr(value, '__iter__'):
+            return [super(MultipleUserFormField, self).valid_value(v)
+                    for v in value]
+        return super(MultipleUserFormField, self).valid_value(value)

From 465497ab30429fec6683dcc7f365f1de6cde5f38 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 4 Aug 2012 14:47:09 +0200
Subject: [PATCH 12/23] some pep8 changes for the user-api

---
 openslides/utils/user/__init__.py |   2 +-
 openslides/utils/user/api.py      |   3 +-
 openslides/utils/user/forms.py    |   2 +-
 openslides/utils/user/model.py    |  65 ------------------
 openslides/utils/user/models.py   | 105 ++++++++++++++----------------
 5 files changed, 52 insertions(+), 125 deletions(-)
 delete mode 100644 openslides/utils/user/model.py

diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
index 36c0e9b86..87b167d8c 100644
--- a/openslides/utils/user/__init__.py
+++ b/openslides/utils/user/__init__.py
@@ -13,7 +13,7 @@
 from openslides.utils.user.signals import receiv_users
 from openslides.utils.user.api import generate_uid, split_uid, get_user, Users
 from openslides.utils.user.forms import UserFormField, MultipleUserFormField
-from openslides.utils.user.model import UserField, UserMixin
+from openslides.utils.user.models import UserField, UserMixin
 
 
 class EmtyUser(UserMixin):
diff --git a/openslides/utils/user/api.py b/openslides/utils/user/api.py
index 13976aad8..02191896d 100644
--- a/openslides/utils/user/api.py
+++ b/openslides/utils/user/api.py
@@ -12,6 +12,7 @@
 
 from openslides.utils.user.signals import receiv_users
 
+
 class Users(object):
     """
     A Storage for a multiplicity of different User-Objects.
@@ -48,6 +49,6 @@ def get_user(uid):
     try:
         user_prefix, id = split_uid(uid)
     except TypeError:
+        from openslides.utils.user import EmtyUser
         return EmtyUser()
-
     return Users(user_prefix=user_prefix, id=id)[0]
diff --git a/openslides/utils/user/forms.py b/openslides/utils/user/forms.py
index 436517a82..383754402 100644
--- a/openslides/utils/user/forms.py
+++ b/openslides/utils/user/forms.py
@@ -14,6 +14,7 @@ from django import forms
 
 from openslides.utils.user.api import Users, get_user
 
+
 class UserChoices(object):
     def __init__(self, field):
         self.field = field
@@ -40,7 +41,6 @@ class UserFormField(forms.fields.ChoiceField):
         result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
         return result
 
-
     def _get_choices(self):
         # If self._choices is set, then somebody must have manually set
         # the property self.choices. In this case, just return self._choices.
diff --git a/openslides/utils/user/model.py b/openslides/utils/user/model.py
deleted file mode 100644
index 5c461da88..000000000
--- a/openslides/utils/user/model.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    openslides.utils.user.models
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Models and ModelFields for the OpenSlides user api.
-
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
-    :license: GNU GPL, see LICENSE for more details.
-"""
-
-from django.db import models
-
-from openslides.utils.user.forms import UserFormField
-from openslides.utils.user.api import get_user, generate_uid
-
-
-class UserField(models.fields.Field):
-    __metaclass__ = models.SubfieldBase
-
-    def __init__(self, *args, **kwargs):
-        super(UserField, self).__init__(max_length=255, *args, **kwargs)
-        # TODO: Validate the uid
-
-    def get_internal_type(self):
-        return "CharField"
-
-    def to_python(self, value):
-        """
-        Convert string value to a User Object.
-        """
-        if hasattr(value, 'uid'):
-            user =  value
-        else:
-            user = get_user(value)
-
-        user.prepare_database_save = lambda unused: UserField() \
-                                                    .get_prep_value(user)
-        return user
-
-    def get_prep_value(self, value):
-        return value.uid
-
-    def value_to_string(self, obj):
-        value = self._get_val_from_obj(obj)
-        return self.get_prep_value(value)
-
-    def formfield(self, **kwargs):
-        defaults = {'form_class': UserFormField}
-        defaults.update(kwargs)
-        return super(UserField, self).formfield(**defaults)
-
-
-class UserMixin(object):
-    @property
-    def uid(self):
-        try:
-            return generate_uid(self.user_prefix, self.pk)
-        except AttributeError:
-            raise AttributeError("%s has to have a attribute 'user_prefix'"
-                                 % self)
-
-    def __repr__(self):
-        return 'User: %s' % self.uid
diff --git a/openslides/utils/user/models.py b/openslides/utils/user/models.py
index 31a8a57c7..c826be061 100644
--- a/openslides/utils/user/models.py
+++ b/openslides/utils/user/models.py
@@ -1,73 +1,64 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-    openslides.utils.user.forms
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    openslides.utils.user.models
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Forms and FormFields for the OpenSlides user api
+    Models and ModelFields for the OpenSlides user api.
 
     :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
+from django.db import models
 
-class UserChoices(object):
-    def __init__(self, field):
-        self.field = field
-
-    def __iter__(self):
-        if self.field.empty_label is not None:
-            yield (u"", self.field.empty_label)
-        for user in Users():
-            yield (user.uid, user)
+from openslides.utils.user.forms import UserFormField
+from openslides.utils.user.api import get_user, generate_uid
 
 
-class UserFormField(forms.fields.ChoiceField):
-    def __init__(self, required=True, initial=None, empty_label=u"---------",
-                 *args, **kwargs):
-        if required and (initial is not None):
-            self.empty_label = None
-        else:
-            self.empty_label = empty_label
-        forms.fields.Field.__init__(self, required=required, initial=initial,
-                                    *args, **kwargs)
-        self.widget.choices = self.choices
-
-    def __deepcopy__(self, memo):
-        result = super(forms.fields.ChoiceField, self).__deepcopy__(memo)
-        return result
-
-
-    def _get_choices(self):
-        # If self._choices is set, then somebody must have manually set
-        # the property self.choices. In this case, just return self._choices.
-        if hasattr(self, '_choices'):
-            return self._choices
-        return UserChoices(self)
-
-    choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
-
-    def to_python(self, value):
-        return get_user(value)
-
-    def valid_value(self, value):
-        return super(UserFormField, self).valid_value(value.uid)
-
-
-class MultipleUserFormField(UserFormField):
-    widget = forms.widgets.SelectMultiple
+class UserField(models.fields.Field):
+    __metaclass__ = models.SubfieldBase
 
     def __init__(self, *args, **kwargs):
-        super(MultipleUserFormField, self).__init__(empty_label=None,
-                                                    *args, **kwargs)
+        super(UserField, self).__init__(max_length=255, *args, **kwargs)
+        # TODO: Validate the uid
+
+    def get_internal_type(self):
+        return "CharField"
 
     def to_python(self, value):
-        if hasattr(value, '__iter__'):
-            return [super(MultipleUserFormField, self).to_python(v)
-                    for v in value]
-        return super(MultipleUserFormField, self).to_python(value)
+        """
+        Convert string value to a User Object.
+        """
+        if hasattr(value, 'uid'):
+            user = value
+        else:
+            user = get_user(value)
 
-    def valid_value(self, value):
-        if hasattr(value, '__iter__'):
-            return [super(MultipleUserFormField, self).valid_value(v)
-                    for v in value]
-        return super(MultipleUserFormField, self).valid_value(value)
+        user.prepare_database_save = (
+            lambda unused: UserField().get_prep_value(user))
+        return user
+
+    def get_prep_value(self, value):
+        return value.uid
+
+    def value_to_string(self, obj):
+        value = self._get_val_from_obj(obj)
+        return self.get_prep_value(value)
+
+    def formfield(self, **kwargs):
+        defaults = {'form_class': UserFormField}
+        defaults.update(kwargs)
+        return super(UserField, self).formfield(**defaults)
+
+
+class UserMixin(object):
+    @property
+    def uid(self):
+        try:
+            return generate_uid(self.user_prefix, self.pk)
+        except AttributeError:
+            raise AttributeError("%s has to have a attribute 'user_prefix'"
+                                 % self)
+
+    def __repr__(self):
+        return 'User: %s' % self.uid

From 1a1bcb235806cef861eb7cb811a402d143c78425 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sat, 4 Aug 2012 15:02:02 +0200
Subject: [PATCH 13/23] updated some parts of OpenSlides to the new user-api

---
 .../templates/application/overview.html       |  2 +-
 .../templates/projector/Application.html      |  2 +-
 openslides/application/views.py               |  9 +++----
 openslides/assignment/forms.py                |  3 +--
 openslides/assignment/models.py               | 23 ++++++++---------
 .../templates/assignment/overview.html        |  2 +-
 .../assignment/templates/assignment/view.html | 25 ++++++++-----------
 .../templates/projector/Assignment.html       | 10 ++++----
 openslides/assignment/views.py                | 14 ++++++-----
 9 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index 2e72d568d..16336453d 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -59,7 +59,7 @@
                 {% if not forloop.last %}<br>{%endif%}
                 {% endfor %}
             </td>
-            <td>{{ application.submitter.profile }}</td>
+            <td>{{ application.submitter }}</td>
             <td>{{ application.creation_time }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
diff --git a/openslides/application/templates/projector/Application.html b/openslides/application/templates/projector/Application.html
index 9f7dddaf7..4a5d1488b 100644
--- a/openslides/application/templates/projector/Application.html
+++ b/openslides/application/templates/projector/Application.html
@@ -53,7 +53,7 @@
         {% endwith %}
 
         <p><b>{% trans "Submitter" %}:</b><br>
-        {{ application.submitter.profile }}
+        {{ application.submitter }}
         </p>
     </div>
     </div>
diff --git a/openslides/application/views.py b/openslides/application/views.py
index f2c12645b..0158e2513 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -748,13 +748,10 @@ class ApplicationPDF(PDFView):
         if application.status == "pub":
             cell1b.append(Paragraph("__________________________________________",stylesheet['Signaturefield']))
             cell1b.append(Spacer(0,0.1*cm))
-            cell1b.append(Paragraph("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+unicode(application.submitter.profile), stylesheet['Small']))
+            cell1b.append(Paragraph("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"+unicode(application.submitter), stylesheet['Small']))
             cell1b.append(Spacer(0,0.2*cm))
         else:
-            try:
-                cell1b.append(Paragraph(unicode(application.submitter.profile), stylesheet['Normal']))
-            except Profile.DoesNotExist:
-                pass
+            cell1b.append(Paragraph(unicode(application.submitter), stylesheet['Normal']))
 
         # supporters
         cell2a = []
@@ -764,7 +761,7 @@ class ApplicationPDF(PDFView):
             cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset id='counter'>" % _("Supporters"), stylesheet['Heading4']))
 
             for supporter in application.supporters:
-                cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(s.profile), stylesheet['Signaturefield']))
+                cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % unicode(supporter), stylesheet['Signaturefield']))
             if application.status == "pub":
                 for x in range(0,application.missing_supporters):
                     cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; __________________________________________",stylesheet['Signaturefield']))
diff --git a/openslides/assignment/forms.py b/openslides/assignment/forms.py
index 07c06fc02..c3a648355 100644
--- a/openslides/assignment/forms.py
+++ b/openslides/assignment/forms.py
@@ -16,7 +16,6 @@ from django.utils.translation import ugettext_lazy as _, ugettext_noop
 from openslides.utils.forms import CssClassMixin
 from openslides.utils.user import UserFormField
 
-from openslides.participant.models import Profile
 from openslides.assignment.models import Assignment
 
 
@@ -26,7 +25,7 @@ class AssignmentForm(forms.ModelForm, CssClassMixin):
 
     class Meta:
         model = Assignment
-        exclude = ('status', 'profile', 'elected')
+        exclude = ('status', 'elected')
 
 
 class AssignmentRunForm(forms.Form, CssClassMixin):
diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index 6f7fbf169..d3bab3dca 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -23,8 +23,6 @@ from openslides.config.signals import default_config_value
 from openslides.projector.api import register_slidemodel
 from openslides.projector.projector import SlideMixin
 
-from openslides.participant.models import Profile
-
 from openslides.poll.models import (BasePoll, CountInvalid, CountVotesCast,
     BaseOption, PublishPollMixin, BaseVote)
 
@@ -71,28 +69,27 @@ class Assignment(models.Model, SlideMixin):
         self.status = status
         self.save()
 
-    def run(self, profile, user=None):
+    def run(self, candidate, user=None):
         """
         run for a vote
         """
-        if self.is_candidate(profile):
-            raise NameError(_('<b>%s</b> is already a candidate.') % profile)
+        # TODO: don't make any permission checks here.
+        #       Use other Exceptions
+        if self.is_candidate(candidate):
+            raise NameError(_('<b>%s</b> is already a candidate.') % candidate)
         if not user.has_perm("assignment.can_manage_assignment") and self.status != 'sea':
             raise NameError(_('The candidate list is already closed.'))
-        AssignmentCandidate(assignment=self, user=profile, elected=False).save()
+        AssignmentCandidate(assignment=self, user=candidate, elected=False).save()
 
-    def delrun(self, user):
+    def delrun(self, candidate):
         """
         stop running for a vote
         """
-        if self.status != 'sea':
-            # TODO: Use an OpenSlides Error
-            raise Exception(_('The candidate list is already closed.'))
-        if self.is_candidate(user):
-            assignment_candidats.get(user=user).delete()
+        if self.is_candidate(candidate):
+            self.assignment_candidats.get(user=candidate).delete()
         else:
             # TODO: Use an OpenSlides Error
-            raise Exception(_('%s is no candidate') % user)
+            raise Exception(_('%s is no candidate') % candidate)
 
     def is_candidate(self, user):
         if self.assignment_candidats.filter(user=user).exists():
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 85e850c18..2d9e3b8e0 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -31,7 +31,7 @@
         <tr class="{% cycle '' 'odd' %}
             {% if assignment.active %}activeline{% endif %}">
             <td><a href="{% url assignment_view assignment.id %}">{{ assignment }}</a></td>
-            <td>{{ assignment.profile.count }} / {{ assignment.posts }}</td>
+            <td>{{ assignment.candidates|length }} / {{ assignment.posts }}</td>
             <td>{{ assignment.get_status_display }}</td>
             <td>
                 <span style="width: 1px; white-space: nowrap;">
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 9a60c96db..2614b26d6 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -54,21 +54,18 @@
     <form action="" method="post">{% csrf_token %}
         {% if perms.assignment.can_nominate_self %}
             <p>
-            {% if user.profile in assignment.profile.all %}
-
-            <a href='{% url assignment_delrun assignment.id %}'>
-            <span class="button">
-                <span class="icon removeuser">{% trans 'Withdraw self candidature' %}</span>
-            </span>
-            </a>
+            {% if user in assignment.candidates %}
+                <a href='{% url assignment_delrun assignment.id %}'>
+                    <span class="button">
+                        <span class="icon removeuser">{% trans 'Withdraw self candidature' %}</span>
+                    </span>
+                </a>
             {% else %}
-            {% if user.profile %}
-            <a href='{% url assignment_run assignment.id %}'>
-            <span class="button">
-                <span class="icon adduser">{% trans 'Self candidature' %}</span>
-            </span>
-            </a>
-            {% endif %}
+                <a href='{% url assignment_run assignment.id %}'>
+                    <span class="button">
+                        <span class="icon adduser">{% trans 'Self candidature' %}</span>
+                    </span>
+                </a>
             {% endif %}
             </p>
         {% endif %}
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index d516baa88..8627d6022 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -28,17 +28,17 @@
 {% endblock %}
 
 {% block scrollcontent %}
-    {% if not assignment.profile.exists %}
+    {% if not assignment.candidates %}
         <p>
             <div class="text">{{ assignment.description|linebreaks }}</div>
         </p>
     {% endif %}
 
-    {% if assignment.profile.exists and assignment.status != "fin" %}
+    {% if assignment.candidates and assignment.status != "fin" %}
         <h3>{% trans "Candidates" %}</h3>
         <ol>
-            {% for profile in assignment.profile.all|dictsort:"user.first_name" %}
-                <li>{{ profile }} </li>
+            {% for candidate in assignment.candidates %}
+                <li>{{ candidate }} </li>
             {% empty %}
                 <li style="list-style: none outside none;">
                     <i>{% trans "No candidates available." %}</i>
@@ -122,7 +122,7 @@
         </tr>
 
         </table>
-    {% elif assignment.profile.exists %}
+    {% elif assignment.candidates %}
         <i>{% trans "No ballots available." %}</i>
     {% endif %}
     <br>
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 350bf0e19..0b2ef82a0 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -33,7 +33,9 @@ from openslides.utils.views import FormView, DeleteView, PDFView, RedirectView
 from openslides.utils.user import get_user
 
 from openslides.config.models import config
+
 from openslides.participant.models import Profile
+from openslides.participant.api import user2djangouser
 
 from openslides.projector.projector import Widget
 
@@ -169,13 +171,10 @@ def set_status(request, assignment_id=None, status=None):
 def run(request, assignment_id):
     assignment = Assignment.objects.get(pk=assignment_id)
     try:
-        assignment.run(request.user.profile, request.user)
+        assignment.run(user2djangouser(request.user), request.user)
         messages.success(request, _('You have set your candidature successfully.') )
     except NameError, e:
         messages.error(request, e)
-    except Profile.DoesNotExist:
-        messages.error(request,
-                       _("You can't candidate. Your user account is only for administration."))
     return redirect(reverse('assignment_view', args=[assignment_id]))
 
 
@@ -183,7 +182,10 @@ def run(request, assignment_id):
 def delrun(request, assignment_id):
     assignment = Assignment.objects.get(pk=assignment_id)
     try:
-        assignment.delrun(request.user.profile)
+        if assignment.status == 'sea' or user.has_perm("assignment.can_manage_assignment"):
+            assignment.delrun(user2djangouser(request.user))
+        else:
+            messages.error(request, _('The candidate list is already closed.'))
     except Exception, e:
         messages.error(request, e)
     else:
@@ -370,7 +372,7 @@ class AssignmentPDF(PDFView):
         cell2a.append(Paragraph("<font name='Ubuntu-Bold'>%s:</font><seqreset" \
             " id='counter'>" % _("Candidates"), stylesheet['Heading4']))
         cell2b = []
-        for candidate in assignment.profile.all():
+        for candidate in assignment.candidates:
             cell2b.append(Paragraph("<seq id='counter'/>.&nbsp; %s" % candidate,
                 stylesheet['Signaturefield']))
         if assignment.status == "sea":

From bcd98301a9ce4f85e9a72198de46202b5e55442c Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 5 Aug 2012 10:59:25 +0200
Subject: [PATCH 14/23] remove mercurial_version from openslides.__init__

---
 openslides/__init__.py | 55 +++---------------------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/openslides/__init__.py b/openslides/__init__.py
index 6e440cbbb..ba0c9814b 100644
--- a/openslides/__init__.py
+++ b/openslides/__init__.py
@@ -5,10 +5,11 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-VERSION = (1, 2, 0, 'final', 1)
+VERSION = (1, 2, 1, 'alpha', 0)
 
 def get_version(version=None):
     """Derives a PEP386-compliant version number from VERSION."""
+    # TODO: Get the Version Hash from GIT.
     if version is None:
         version = VERSION
     assert len(version) == 5
@@ -24,59 +25,9 @@ def get_version(version=None):
 
     sub = ''
     if version[3] == 'alpha' and version[4] == 0:
-        mercurial_version = hg_version()
-        if mercurial_version != 'unknown':
-            sub = '.dev%s' % mercurial_version
-        else:
-            sub = '.dev'
+        sub = '.dev'
 
     elif version[3] != 'final':
         sub = "-" + version[3] + str(version[4])
 
     return main + sub
-
-
-def hg_version():
-    import socket
-    import os
-    import sys
-    from os.path import realpath, join, dirname
-    try:
-        from mercurial import ui as hgui
-        from mercurial.localrepo import localrepository
-        from mercurial.node import short as shorthex
-        from mercurial.error import RepoError
-        nomercurial = False
-    except ImportError:
-        return 'unknown'
-
-    os.environ['HGRCPATH'] = ''
-    conts = realpath(join(dirname(__file__)))
-    try:
-        ui = hgui.ui()
-        repository = localrepository(ui, join(conts, '..'))
-        ctx = repository['.']
-        if ctx.tags() and ctx.tags() != ['tip']:
-            version = ' '.join(ctx.tags())
-        else:
-            version = '%(num)s:%(id)s' % {
-                'num': ctx.rev(), 'id': shorthex(ctx.node())
-            }
-    except TypeError:
-        version = 'unknown'
-    except RepoError:
-        return 0
-
-    # This value defines the timeout for sockets in seconds.  Per default python
-    # sockets do never timeout and as such we have blocking workers.
-    # Socket timeouts are set globally within the whole application.
-    # The value *must* be a floating point value.
-    socket.setdefaulttimeout(10.0)
-
-    return version
-
-
-## import os, site
-##
-## SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
-## site.addsitedir(SITE_ROOT)

From 4873cd71637954409b337d59693070d66b50e2b8 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 5 Aug 2012 11:28:56 +0200
Subject: [PATCH 15/23] fixted #330. Error if the related slide for an Agenda
 Item does not exists

---
 openslides/agenda/models.py | 9 ++++++++-
 openslides/agenda/tests.py  | 8 ++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/openslides/agenda/models.py b/openslides/agenda/models.py
index cd67de1a6..d887d553c 100644
--- a/openslides/agenda/models.py
+++ b/openslides/agenda/models.py
@@ -52,7 +52,14 @@ class Item(MPTTModel, SlideMixin):
         """
         return the object, of which the item points.
         """
-        return get_slide_from_sid(self.related_sid, True)
+        object = get_slide_from_sid(self.related_sid, element=True)
+        if object is None:
+            self.title = 'Item for deleted slide: %s' % self.related_sid
+            self.related_sid = None
+            self.save()
+            return self
+        else:
+            return object
 
     def get_related_type(self):
         """
diff --git a/openslides/agenda/tests.py b/openslides/agenda/tests.py
index 0906eaef2..ca56e009d 100644
--- a/openslides/agenda/tests.py
+++ b/openslides/agenda/tests.py
@@ -15,9 +15,9 @@ from django.test.client import Client
 from django.contrib.auth.models import User
 from django.db.models.query import EmptyQuerySet
 
-from projector.api import get_active_slide
+from openslides.projector.api import get_active_slide
 
-from agenda.models import Item
+from openslides.agenda.models import Item
 
 class ItemTest(TestCase):
     def setUp(self):
@@ -60,6 +60,10 @@ class ItemTest(TestCase):
                 self.assertEqual(initial['parent'], 0)
             self.assertEqual(initial['weight'], item.weight)
 
+    def testRelated_sid(self):
+        self.item1.related_sid = 'foobar'
+        self.assertFalse(self.item1.get_related_slide() is None)
+
 
 class ViewTest(TestCase):
     def setUp(self):

From 998fb3e1eecd70a8f835db72e01d06bcd244a6d2 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 5 Aug 2012 11:48:03 +0200
Subject: [PATCH 16/23] fix #336. The admin could not edit the supporters from
 applications

---
 openslides/application/views.py | 46 ++++++++++++---------------------
 1 file changed, 17 insertions(+), 29 deletions(-)

diff --git a/openslides/application/views.py b/openslides/application/views.py
index 8e8fd39c7..538d57f4d 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -212,9 +212,6 @@ def edit(request, application_id=None):
             del_supporters = True
             original_supporters = []
             if is_manager:
-                if application: # Edit application
-                    for s in application.supporter.all():
-                        original_supporters.append(s)
                 application = managerform.save(commit=False)
             elif application_id is None:
                 application = Application(submitter=request.user)
@@ -229,28 +226,20 @@ def edit(request, application_id=None):
                 trivial_change = False
             application.save(request.user, trivial_change=trivial_change)
             if is_manager:
-                # log added supporters
-                supporters_added = []
-                for s in application.supporter.all():
-                    if s not in original_supporters:
-                        try:
-                            supporters_added.append(unicode(s.profile))
-                        except Profile.DoesNotExist:
-                            pass
-                if len(supporters_added) > 0:
-                    log_added = ", ".join(supporters_added)
-                    application.writelog(_("Supporter: +%s") % log_added, request.user)
-                # log removed supporters
-                supporters_removed = []
-                for s in original_supporters:
-                    if s not in application.supporter.all():
-                        try:
-                            supporters_removed.append(unicode(s.profile))
-                        except Profile.DoesNotExist:
-                            pass
-                if len(supporters_removed) > 0:
-                    log_removed = ", ".join(supporters_removed)
-                    application.writelog(_("Supporter: -%s") % log_removed, request.user)
+                try:
+                    new_supporters = set(managerform.cleaned_data['supporter'])
+                except KeyError:
+                    # The managerform has no field for the supporters
+                    pass
+                else:
+                    old_supporters = set(application.supporter.all())
+                    # add new supporters
+                    for supporter in new_supporters.difference(old_supporters):
+                        application.support(supporter)
+                    # remove old supporters
+                    for supporter in old_supporters.difference(new_supporters):
+                        application.unsupport(supporter)
+
             if application_id is None:
                 messages.success(request, _('New application was successfully created.'))
             else:
@@ -280,10 +269,9 @@ def edit(request, application_id=None):
             if application_id is None:
                 initial = {'submitter': str(request.user.id)}
             else:
-                initial = {}
-            managerform = managerformclass(initial=initial, \
-                                                 instance=application, \
-                                                 prefix="manager")
+                initial = {'supporter': application.supporter.all()}
+            managerform = managerformclass(
+                initial=initial, instance=application, prefix="manager")
         else:
             managerform = None
     return {

From 008c7436500bbb08534ea353f2982af3c66bf37e Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Sun, 5 Aug 2012 11:58:11 +0200
Subject: [PATCH 17/23] fixt #334. Let the anonymous user see the assignments
 by default

---
 openslides/config/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openslides/config/views.py b/openslides/config/views.py
index 7cd479f26..07756193a 100644
--- a/openslides/config/views.py
+++ b/openslides/config/views.py
@@ -67,16 +67,16 @@ class GeneralConfig(FormView):
                 anonymous = Group.objects.get(name='Anonymous')
             except Group.DoesNotExist:
                 default_perms = [u'can_see_agenda', u'can_see_projector',
-                    u'can_see_application']
+                    u'can_see_application', 'can_see_assignment']
                 anonymous = Group()
                 anonymous.name = 'Anonymous'
                 anonymous.save()
                 anonymous.permissions = Permission.objects.filter(
                     codename__in=default_perms)
                 anonymous.save()
-            messages.success(self.request,
-                _('Anonymous access enabled. Please modify the "Anonymous" ' \
-                'group to fit your required permissions.'))
+                messages.success(self.request,
+                    _('Anonymous access enabled. Please modify the "Anonymous" ' \
+                    'group to fit your required permissions.'))
         else:
             config['system_enable_anonymous'] = False
 

From ab33b9f05a8edb9270d5b0d1aec391118b487203 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Mon, 6 Aug 2012 14:58:52 +0200
Subject: [PATCH 18/23] fix error in application-supporters an
 assignment-candidates, for non admin users

---
 openslides/application/models.py                     | 2 +-
 openslides/assignment/templates/assignment/view.html | 2 +-
 openslides/assignment/views.py                       | 3 +++
 openslides/participant/models.py                     | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/openslides/application/models.py b/openslides/application/models.py
index 4b45a5ed8..6da30fe23 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -362,7 +362,7 @@ class Application(models.Model, SlideMixin):
         is_admin = False
         if user:
             try:
-                user.profile
+                user = user.profile
             except Profile.DoesNotExist:
                 is_admin = True
             except AttributeError:
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 2614b26d6..cab930676 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -54,7 +54,7 @@
     <form action="" method="post">{% csrf_token %}
         {% if perms.assignment.can_nominate_self %}
             <p>
-            {% if user in assignment.candidates %}
+            {% if user_is_candidate %}
                 <a href='{% url assignment_delrun assignment.id %}'>
                     <span class="button">
                         <span class="icon removeuser">{% trans 'Withdraw self candidature' %}</span>
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 0b2ef82a0..6320c459b 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -97,11 +97,14 @@ def view(request, assignment_id=None):
     else:
         polls = assignment.poll_set.all()
         vote_results = assignment.vote_results(only_published=False)
+
+    user = user2djangouser(request.user)
     return {
         'assignment': assignment,
         'form': form,
         'vote_results': vote_results,
         'polls': polls,
+        'user_is_candidate': assignment.is_candidate(user)
     }
 
 
diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index 919e03b95..1913da474 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -58,6 +58,9 @@ class Profile(models.Model, UserMixin):
         self.user.set_password(self.firstpassword)
         self.user.save()
 
+    def has_perm(self, perm):
+        return self.user.has_perm(perm)
+
     @models.permalink
     def get_absolute_url(self, link='edit'):
         """

From b55ceddb824fe72b00a2e34e197c5cda27f9e9da Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Tue, 7 Aug 2012 10:15:39 +0200
Subject: [PATCH 19/23] append tests for the participant app

---
 openslides/openslides_settings.py |  1 -
 openslides/participant/tests.py   | 87 +++++++++++++++++++++++++++++++
 openslides/utils/user/api.py      | 19 +++++--
 3 files changed, 102 insertions(+), 5 deletions(-)
 create mode 100644 openslides/participant/tests.py

diff --git a/openslides/openslides_settings.py b/openslides/openslides_settings.py
index 6486831dd..ed2b0145e 100755
--- a/openslides/openslides_settings.py
+++ b/openslides/openslides_settings.py
@@ -124,7 +124,6 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'mptt',
-    'openslides.utils',
     'openslides.poll',
     'openslides.projector',
     'openslides.agenda',
diff --git a/openslides/participant/tests.py b/openslides/participant/tests.py
new file mode 100644
index 000000000..fa4026335
--- /dev/null
+++ b/openslides/participant/tests.py
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.participant.tests
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Unit test for the participant app.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from django.test import TestCase
+from django.test.client import Client
+from django.contrib.auth.models import User, Group
+from django.db.models.query import EmptyQuerySet
+from django.contrib.auth.hashers import check_password
+
+from openslides.utils.user import get_user, Users
+from openslides.participant.api import gen_username, gen_password, user2djangouser
+from openslides.participant.models import Profile, DjangoGroup, DjangoUser
+
+
+class ParticipantTest(TestCase):
+    def setUp(self):
+        self.user1 = User(first_name=u'Max', last_name=u'Mustermann')
+        self.user1.username = gen_username(self.user1.first_name, self.user1.last_name)
+        self.user1.save()
+        self.participant1 = Profile.objects.create(user=self.user1, firstpassword=gen_password())
+
+    def test_participant_user(self):
+        self.assertEqual(self.user1.profile, self.participant1)
+        self.assertEqual(self.user1, self.participant1.user)
+
+    def test_repr(self):
+        self.assertEqual(unicode(self.participant1), u'Max Mustermann')
+
+    def test_group(self):
+        self.participant1.group = u'München'
+        self.participant1.save()
+        self.assertEqual(unicode(self.participant1), u'Max Mustermann (München)')
+
+    def test_reset_password(self):
+        self.assertIsInstance(self.participant1.firstpassword, basestring)
+        self.assertEqual(len(self.participant1.firstpassword), 8)
+        self.user1.set_unusable_password()
+        self.assertFalse(self.user1.check_password(self.participant1.firstpassword))
+        self.participant1.reset_password()
+        self.assertTrue(self.user1.check_password(self.participant1.firstpassword))
+
+    def test_user_api(self):
+        self.assertTrue(hasattr(self.participant1, 'uid'))
+        self.assertEqual(self.participant1.uid, 'participant:1')
+        self.assertEqual(get_user('participant:1'), self.participant1)
+        self.assertEqual(len(Users()), 1)
+
+
+class DjangoGroupTest(TestCase):
+    def setUp(self):
+        self.group1 = Group.objects.create(name='Test Group')
+        self.djangogroup1 = DjangoGroup.objects.create(group=self.group1)
+
+    def test_group_djangogroup(self):
+        self.assertEqual(self.djangogroup1.group, self.group1)
+
+    def test_user_api(self):
+        self.assertTrue(hasattr(self.djangogroup1, 'uid'))
+        self.assertEqual(self.djangogroup1.uid, 'djangogroup:1')
+        self.assertEqual(get_user('djangogroup:1'), self.djangogroup1)
+
+
+class DjangoUserTest(TestCase):
+    def setUp(self):
+        self.user1 = User.objects.create(username='admin')
+        self.djangouser1 = DjangoUser.objects.get(pk=1)
+
+    def test_djangouser_user(self):
+        self.assertEqual(self.user1.pk, self.djangouser1.pk)
+
+    def test_has_no_profile(self):
+        self.assertTrue(self.djangouser1.has_no_profile())
+
+    def test_user_api(self):
+        self.assertTrue(hasattr(self.djangouser1, 'uid'))
+        self.assertEqual(self.djangouser1.uid, 'djangouser:1')
+        self.assertEqual(get_user('djangouser:1'), self.djangouser1)
+        self.assertEqual(user2djangouser(self.user1), self.djangouser1)
diff --git a/openslides/utils/user/api.py b/openslides/utils/user/api.py
index 02191896d..7e418ab61 100644
--- a/openslides/utils/user/api.py
+++ b/openslides/utils/user/api.py
@@ -22,15 +22,26 @@ class Users(object):
         self.id = id
 
     def __iter__(self):
-        for receiver, users in receiv_users.send(
-                sender='users', user_prefix=self.user_prefix, id=self.id):
-            for user in users:
-                yield user
+        try:
+            return iter(self._cache)
+        except AttributeError:
+            return iter(self.iter_users())
+
+    def __len__(self):
+        return len(list(self.__iter__()))
 
     def __getitem__(self, key):
         user_list = list(self)
         return user_list[key]
 
+    def iter_users(self):
+        self._cache = list()
+        for receiver, users in receiv_users.send(
+                sender='users', user_prefix=self.user_prefix, id=self.id):
+            for user in users:
+                self._cache.append(user)
+                yield user
+
 
 def generate_uid(prefix, id):
     if ':' in prefix:

From 1719aa588d6b9666423e4030870c8a3e0aa5da2c Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Tue, 7 Aug 2012 22:43:57 +0200
Subject: [PATCH 20/23] rename some user api and participant names

---
 initial_data.json                             | 14 +--
 openslides/application/forms.py               | 25 +----
 openslides/application/models.py              | 29 +++---
 openslides/application/views.py               | 58 ++++++------
 openslides/assignment/forms.py                |  4 +-
 openslides/assignment/models.py               | 35 ++++---
 .../templates/assignment/poll_view.html       | 56 ++++++------
 .../assignment/templates/assignment/view.html | 10 +-
 openslides/assignment/views.py                | 31 +++----
 openslides/openslides_settings.py             |  2 +-
 openslides/participant/api.py                 | 12 +--
 openslides/participant/forms.py               |  6 +-
 openslides/participant/models.py              | 81 +++++++----------
 openslides/participant/views.py               | 91 ++++++++++---------
 openslides/utils/person/__init__.py           | 22 +++++
 openslides/utils/person/api.py                | 64 +++++++++++++
 openslides/utils/{user => person}/forms.py    | 34 +++----
 openslides/utils/{user => person}/models.py   | 40 ++++----
 openslides/utils/{user => person}/signals.py  |  2 +-
 openslides/utils/user/__init__.py             | 22 -----
 openslides/utils/user/api.py                  | 65 -------------
 21 files changed, 334 insertions(+), 369 deletions(-)
 create mode 100644 openslides/utils/person/__init__.py
 create mode 100644 openslides/utils/person/api.py
 rename openslides/utils/{user => person}/forms.py (66%)
 rename openslides/utils/{user => person}/models.py (50%)
 rename openslides/utils/{user => person}/signals.py (82%)
 delete mode 100644 openslides/utils/user/__init__.py
 delete mode 100644 openslides/utils/user/api.py

diff --git a/initial_data.json b/initial_data.json
index e7451296e..ad17d7a56 100644
--- a/initial_data.json
+++ b/initial_data.json
@@ -38,7 +38,7 @@
             [
                "can_see_participant",
                "participant",
-               "profile"
+               "openslidesuser"
             ],
             [
                "can_see_projector",
@@ -92,7 +92,7 @@
             [
                "can_see_participant",
                "participant",
-               "profile"
+               "openslidesuser"
             ],
             [
                "can_see_projector",
@@ -161,12 +161,12 @@
             [
                "can_manage_participant",
                "participant",
-               "profile"
+               "openslidesuser"
             ],
             [
                "can_see_participant",
                "participant",
-               "profile"
+               "openslidesuser"
             ],
             [
                "can_manage_projector",
@@ -195,12 +195,12 @@
             [
                "can_manage_participant",
                "participant",
-               "profile"
+               "openslidesuser"
             ],
             [
                "can_see_participant",
                "participant",
-               "profile"
+               "openslidesuser"
             ],
             [
                "can_see_projector",
@@ -210,4 +210,4 @@
          ]
       }
    }
-]
\ No newline at end of file
+]
diff --git a/openslides/application/forms.py b/openslides/application/forms.py
index 34a7ef9b9..963e0f531 100644
--- a/openslides/application/forms.py
+++ b/openslides/application/forms.py
@@ -11,32 +11,13 @@
 """
 
 from django import forms
-from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
 from openslides.utils.forms import CssClassMixin
-from openslides.utils.user import UserFormField, MultipleUserFormField
+from openslides.utils.person import PersonFormField, MultiplePersonFormField
 from openslides.application.models import Application
 
 
-class UserModelChoiceField(forms.ModelChoiceField):
-    """
-    Extend ModelChoiceField for users so that the choices are
-    listed as 'first_name last_name' instead of just 'username'.
-    """
-    def label_from_instance(self, obj):
-        return obj.get_full_name()
-
-
-class UserModelMultipleChoiceField(forms.ModelMultipleChoiceField):
-    """
-    Extend ModelMultipleChoiceField for users so that the choices are
-    listed as 'first_name last_name' instead of just 'username'.
-    """
-    def label_from_instance(self, obj):
-        return obj.get_full_name()
-
-
 class ApplicationForm(forms.Form, CssClassMixin):
     title = forms.CharField(widget=forms.TextInput(), label=_("Title"))
     text = forms.CharField(widget=forms.Textarea(), label=_("Text"))
@@ -51,7 +32,7 @@ class ApplicationFormTrivialChanges(ApplicationForm):
 
 
 class ApplicationManagerForm(forms.ModelForm, CssClassMixin):
-    submitter = UserFormField()
+    submitter = PersonFormField()
 
     class Meta:
         model = Application
@@ -60,7 +41,7 @@ class ApplicationManagerForm(forms.ModelForm, CssClassMixin):
 
 class ApplicationManagerFormSupporter(ApplicationManagerForm):
     # TODO: Do not show the submitter in the user-list
-    supporter = MultipleUserFormField(required=False, label=_("Supporters"))
+    supporter = MultiplePersonFormField(required=False, label=_("Supporters"))
 
 
 class ApplicationImportForm(forms.Form, CssClassMixin):
diff --git a/openslides/application/models.py b/openslides/application/models.py
index 6da30fe23..78ebd55b6 100644
--- a/openslides/application/models.py
+++ b/openslides/application/models.py
@@ -21,12 +21,12 @@ from django.utils.translation import pgettext
 from django.utils.translation import ugettext_lazy as _, ugettext_noop, ugettext
 
 from openslides.utils.utils import _propper_unicode
-from openslides.utils.user import UserField
+from openslides.utils.person import PersonField
 
 from openslides.config.models import config
 from openslides.config.signals import default_config_value
 
-from openslides.participant.models import Profile
+from openslides.participant.models import OpenSlidesUser
 
 from openslides.poll.models import (BaseOption, BasePoll, CountVotesCast,
     CountInvalid, BaseVote)
@@ -39,7 +39,7 @@ from openslides.agenda.models import Item
 
 class ApplicationSupporter(models.Model):
     application = models.ForeignKey("Application")
-    user = UserField()
+    person = PersonField()
 
 
 class Application(models.Model, SlideMixin):
@@ -66,7 +66,7 @@ class Application(models.Model, SlideMixin):
         # genpoll
     )
 
-    submitter = UserField(verbose_name=_("Submitter"))
+    submitter = PersonField(verbose_name=_("Submitter"))
     number = models.PositiveSmallIntegerField(blank=True, null=True,
                                         unique=True)
     status = models.CharField(max_length=3, choices=STATUS, default='pub')
@@ -163,10 +163,11 @@ class Application(models.Model, SlideMixin):
 
     @property
     def supporters(self):
-        return [object.user for object in self.applicationsupporter_set.all()]
+        for object in self.applicationsupporter_set.all():
+            yield object.person
 
-    def is_supporter(self, user):
-        return self.applicationsupporter_set.filter(user=user).exists()
+    def is_supporter(self, person):
+        return self.applicationsupporter_set.filter(person=person).exists()
 
     @property
     def enough_supporters(self):
@@ -251,20 +252,20 @@ class Application(models.Model, SlideMixin):
         self.save()
         self.writelog(_("Status reseted to: %s") % (self.get_status_display()), user)
 
-    def support(self, user):
+    def support(self, person):
         """
         Add a Supporter to the list of supporters of the application.
         """
-        if user == self.submitter:
+        if person == self.submitter:
             # TODO: Use own Exception
             raise NameError('Supporter can not be the submitter of a ' \
                             'application.')
         if self.permitted is not None:
             # TODO: Use own Exception
             raise NameError('This application is already permitted.')
-        if not self.is_supporter(user):
-            ApplicationSupporter(application=self, user=user).save()
-            self.writelog(_("Supporter: +%s") % (user))
+        if not self.is_supporter(person):
+            ApplicationSupporter(application=self, person=person).save()
+            self.writelog(_("Supporter: +%s") % (person))
 
     def unsupport(self, user):
         """
@@ -362,8 +363,8 @@ class Application(models.Model, SlideMixin):
         is_admin = False
         if user:
             try:
-                user = user.profile
-            except Profile.DoesNotExist:
+                user = user.openslidesuser
+            except OpenSlidesUser.DoesNotExist:
                 is_admin = True
             except AttributeError:
                 # For the anonymous-user
diff --git a/openslides/application/views.py b/openslides/application/views.py
index 0158e2513..d531b0cab 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -42,7 +42,7 @@ from openslides.utils.template import Tab
 from openslides.utils.utils import (template, permission_required,
     del_confirm_form, gen_confirm_form)
 from openslides.utils.views import PDFView, RedirectView, DeleteView, FormView
-from openslides.utils.user import get_user
+from openslides.utils.person import get_person
 
 from openslides.config.models import config
 
@@ -50,8 +50,8 @@ from openslides.projector.projector import Widget
 
 from openslides.poll.views import PollFormView
 
-from openslides.participant.api import gen_username, gen_password, user2djangouser
-from openslides.participant.models import Profile
+from openslides.participant.api import gen_username, gen_password
+from openslides.participant.models import OpenSlidesUser
 
 from openslides.agenda.models import Item
 
@@ -124,7 +124,7 @@ def overview(request):
     for (i, application) in enumerate(applications):
         try:
             applications[i] = {
-                'actions'     : application.get_allowed_actions(user2djangouser(request.user)),
+                'actions'     : application.get_allowed_actions(request.user.openslidesuser),
                 'application' : application
             }
         except:
@@ -152,7 +152,7 @@ def view(request, application_id, newest=False):
     else:
         version = application.public_version
     revisions = application.versions
-    user = user2djangouser(request.user)
+    user = request.user.openslidesuser
     actions = application.get_allowed_actions(user=user)
 
     return {
@@ -183,11 +183,11 @@ def edit(request, application_id=None):
     if application_id is not None:
         application = Application.objects.get(id=application_id)
         if (not hasattr(application.submitter, 'user') or
-            not user2djangouser(request.user) == application.submitter.user) \
+            not request.user.openslidesuser == application.submitter.user) \
             and not is_manager:
             messages.error(request, _("You can not edit this application. You are not the submitter."))
             return redirect(reverse('application_view', args=[application.id]))
-        actions = application.get_allowed_actions(user=user2djangouser(request.user))
+        actions = application.get_allowed_actions(user=request.user.openslidesuser)
     else:
         application = None
         actions = None
@@ -221,7 +221,7 @@ def edit(request, application_id=None):
                     original_supporters = []
                 application = managerform.save(commit=False)
             elif application_id is None:
-                application = Application(submitter=user2djangouser(request.user))
+                application = Application(submitter=request.user.openslidesuser)
             application.title = dataform.cleaned_data['title']
             application.text = dataform.cleaned_data['text']
             application.reason = dataform.cleaned_data['reason']
@@ -231,7 +231,7 @@ def edit(request, application_id=None):
                     and dataform.cleaned_data['trivial_change']
             except KeyError:
                 trivial_change = False
-            application.save(user2djangouser(request.user), trivial_change=trivial_change)
+            application.save(request.user.openslidesuser, trivial_change=trivial_change)
             if is_manager:
                 try:
                     new_supporters = set(managerform.cleaned_data['supporter'])
@@ -273,10 +273,10 @@ def edit(request, application_id=None):
         dataform = formclass(initial=initial, prefix="data")
         if is_manager:
             if application_id is None:
-                initial = {'submitter': user2djangouser(request.user).uid}
+                initial = {'submitter': request.user.openslidesuser.person_id}
             else:
-                initial = {'submitter': application.submitter.uid,
-                    'supporter': [supporter.uid for supporter in application.supporters]}
+                initial = {'submitter': application.submitter.person_id,
+                    'supporter': [supporter.person_id for supporter in application.supporters]}
             managerform = managerformclass(initial=initial,
                 instance=application, prefix="manager")
         else:
@@ -296,7 +296,7 @@ def set_number(request, application_id):
     set a number for an application.
     """
     try:
-        Application.objects.get(pk=application_id).set_number(user=user2djangouser(request.user))
+        Application.objects.get(pk=application_id).set_number(user=request.user.openslidesuser)
         messages.success(request, _("Application number was successfully set."))
     except Application.DoesNotExist:
         pass
@@ -312,7 +312,7 @@ def permit(request, application_id):
     permit an application.
     """
     try:
-        Application.objects.get(pk=application_id).permit(user=user2djangouser(request.user))
+        Application.objects.get(pk=application_id).permit(user=request.user.openslidesuser)
         messages.success(request, _("Application was successfully permitted."))
     except Application.DoesNotExist:
         pass
@@ -327,7 +327,7 @@ def notpermit(request, application_id):
     reject (not permit) an application.
     """
     try:
-        Application.objects.get(pk=application_id).notpermit(user=user2djangouser(request.user))
+        Application.objects.get(pk=application_id).notpermit(user=request.user.openslidesuser)
         messages.success(request, _("Application was successfully rejected."))
     except Application.DoesNotExist:
         pass
@@ -343,7 +343,7 @@ def set_status(request, application_id=None, status=None):
     try:
         if status is not None:
             application = Application.objects.get(pk=application_id)
-            application.set_status(user=user2djangouser(request.user), status=status)
+            application.set_status(user=request.user.openslidesuser, status=status)
             messages.success(request, _("Application status was set to: <b>%s</b>.") % application.get_status_display())
     except Application.DoesNotExist:
         pass
@@ -359,7 +359,7 @@ def reset(request, application_id):
     reset an application.
     """
     try:
-        Application.objects.get(pk=application_id).reset(user=user2djangouser(request.user))
+        Application.objects.get(pk=application_id).reset(user=request.user.openslides.user)
         messages.success(request, _("Application status was reset.") )
     except Application.DoesNotExist:
         pass
@@ -373,7 +373,7 @@ def support(request, application_id):
     support an application.
     """
     try:
-        Application.objects.get(pk=application_id).support(user=user2djangouser(request.user))
+        Application.objects.get(pk=application_id).support(user=request.user.openslides.user)
         messages.success(request, _("You have support the application successfully.") )
     except Application.DoesNotExist:
         pass
@@ -387,7 +387,7 @@ def unsupport(request, application_id):
     unsupport an application.
     """
     try:
-        Application.objects.get(pk=application_id).unsupport(user=user2djangouser(request.user))
+        Application.objects.get(pk=application_id).unsupport(user=request.user.openslidesuser)
         messages.success(request, _("You have unsupport the application successfully.") )
     except Application.DoesNotExist:
         pass
@@ -401,7 +401,7 @@ def gen_poll(request, application_id):
     gen a poll for this application.
     """
     try:
-        poll = Application.objects.get(pk=application_id).gen_poll(user=user2djangouser(request.user))
+        poll = Application.objects.get(pk=application_id).gen_poll(user=request.user.openslidesuser)
         messages.success(request, _("New vote was successfully created.") )
     except Application.DoesNotExist:
         pass # TODO: do not call poll after this excaption
@@ -418,7 +418,7 @@ def delete_poll(request, poll_id):
     count = application.polls.filter(id__lte=poll_id).count()
     if request.method == 'POST':
         poll.delete()
-        application.writelog(_("Poll deleted"), user2djangouser(request.user))
+        application.writelog(_("Poll deleted"), request.user.openslidesuser)
         messages.success(request, _('Poll was successfully deleted.'))
     else:
         del_confirm_form(request, poll, name=_("the %s. poll") % count, delete_link=reverse('application_poll_delete', args=[poll_id]))
@@ -458,7 +458,7 @@ class ApplicationDelete(DeleteView):
 
         if len(self.applications):
             for application in self.applications:
-                if not 'delete' in application.get_allowed_actions(user=user2djangouser(request.user)):
+                if not 'delete' in application.get_allowed_actions(user=request.user.openslidesuser):
                     messages.error(request, _("You can not delete application <b>%s</b>.") % application)
                     continue
 
@@ -467,7 +467,7 @@ class ApplicationDelete(DeleteView):
                 messages.success(request, _("Application <b>%s</b> was successfully deleted.") % title)
 
         elif self.object:
-            if not 'delete' in self.object.get_allowed_actions(user=user2djangouser(request.user)):
+            if not 'delete' in self.object.get_allowed_actions(user=request.user.openslidesuser):
                 messages.error(request, _("You can not delete application <b>%s</b>.") % self.object)
             else:
                 title = self.object.title
@@ -508,12 +508,12 @@ class ViewPoll(PollFormView):
         self.application = self.poll.get_application()
         context['application'] = self.application
         context['ballot'] = self.poll.get_ballot()
-        context['actions'] = self.application.get_allowed_actions(user=user2djangouser(self.request.user))
+        context['actions'] = self.application.get_allowed_actions(user=self.request.user.openslidesuser)
         return context
 
     def get_modelform_class(self):
         cls = super(ViewPoll, self).get_modelform_class()
-        user = user2djangouser(self.request.user)
+        user = self.request.user.openslidesuser
 
         class ViewPollFormClass(cls):
             def save(self, commit = True):
@@ -535,7 +535,7 @@ def permit_version(request, aversion_id):
     aversion = AVersion.objects.get(pk=aversion_id)
     application = aversion.application
     if request.method == 'POST':
-        application.accept_version(aversion, user=user2djangouser(request.user))
+        application.accept_version(aversion, user=request.user.openslidesuser)
         messages.success(request, _("Version <b>%s</b> accepted.") % (aversion.aid))
     else:
         gen_confirm_form(request, _('Do you really want to permit version <b>%s</b>?') % aversion.aid, reverse('application_version_permit', args=[aversion.id]))
@@ -547,7 +547,7 @@ def reject_version(request, aversion_id):
     aversion = AVersion.objects.get(pk=aversion_id)
     application = aversion.application
     if request.method == 'POST':
-        if application.reject_version(aversion, user=user2djangouser(request.user)):
+        if application.reject_version(aversion, user=request.user.openslidesuser):
             messages.success(request, _("Version <b>%s</b> rejected.") % (aversion.aid))
         else:
             messages.error(request, _("ERROR by rejecting the version.") )
@@ -560,8 +560,8 @@ def reject_version(request, aversion_id):
 @template('application/import.html')
 def application_import(request):
     try:
-        request.user.profile
-    except Profile.DoesNotExist:
+        request.user.openslidesuser
+    except OpenSlidesUser.DoesNotExist:
         pass
     except AttributeError:
         # AnonymousUser
diff --git a/openslides/assignment/forms.py b/openslides/assignment/forms.py
index c3a648355..cf4dfcba2 100644
--- a/openslides/assignment/forms.py
+++ b/openslides/assignment/forms.py
@@ -14,7 +14,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
 from openslides.utils.forms import CssClassMixin
-from openslides.utils.user import UserFormField
+from openslides.utils.person import PersonFormField
 
 from openslides.assignment.models import Assignment
 
@@ -29,7 +29,7 @@ class AssignmentForm(forms.ModelForm, CssClassMixin):
 
 
 class AssignmentRunForm(forms.Form, CssClassMixin):
-    candidate = UserFormField(
+    candidate = PersonFormField(
         widget=forms.Select(attrs={'class': 'medium-input'}),
         label=_("Nominate a participant"),
     )
diff --git a/openslides/assignment/models.py b/openslides/assignment/models.py
index d3bab3dca..bf288cd8e 100644
--- a/openslides/assignment/models.py
+++ b/openslides/assignment/models.py
@@ -15,7 +15,7 @@ from django.db import models
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
-from openslides.utils.user import UserField
+from openslides.utils.person import PersonField
 
 from openslides.config.models import config
 from openslides.config.signals import default_config_value
@@ -31,11 +31,11 @@ from openslides.agenda.models import Item
 
 class AssignmentCandidate(models.Model):
     assignment = models.ForeignKey("Assignment")
-    user = UserField(db_index=True)
+    person = PersonField(db_index=True)
     elected = models.BooleanField(default=False)
 
     def __unicode__(self):
-        return unicode(self.user)
+        return unicode(self.person)
 
 
 class Assignment(models.Model, SlideMixin):
@@ -69,7 +69,7 @@ class Assignment(models.Model, SlideMixin):
         self.status = status
         self.save()
 
-    def run(self, candidate, user=None):
+    def run(self, candidate, person=None):
         """
         run for a vote
         """
@@ -77,22 +77,22 @@ class Assignment(models.Model, SlideMixin):
         #       Use other Exceptions
         if self.is_candidate(candidate):
             raise NameError(_('<b>%s</b> is already a candidate.') % candidate)
-        if not user.has_perm("assignment.can_manage_assignment") and self.status != 'sea':
+        if not person.has_perm("assignment.can_manage_assignment") and self.status != 'sea':
             raise NameError(_('The candidate list is already closed.'))
-        AssignmentCandidate(assignment=self, user=candidate, elected=False).save()
+        AssignmentCandidate(assignment=self, person=candidate, elected=False).save()
 
     def delrun(self, candidate):
         """
         stop running for a vote
         """
         if self.is_candidate(candidate):
-            self.assignment_candidats.get(user=candidate).delete()
+            self.assignment_candidats.get(person=candidate).delete()
         else:
             # TODO: Use an OpenSlides Error
             raise Exception(_('%s is no candidate') % candidate)
 
-    def is_candidate(self, user):
-        if self.assignment_candidats.filter(user=user).exists():
+    def is_candidate(self, person):
+        if self.assignment_candidats.filter(person=person).exists():
             return True
         else:
             return False
@@ -122,23 +122,22 @@ class Assignment(models.Model, SlideMixin):
         if only_candidate:
             candidates = candidates.filter(elected=False)
 
-        return [candidate.user for candidate in candidates]
-        #for candidate in candidates:
-        #    yield candidate.user
+        for candidate in candidates.all():
+            yield candidate.person
 
 
-    def set_elected(self, user, value=True):
-        candidate = self.assignment_candidats.get(user=user)
+    def set_elected(self, person, value=True):
+        candidate = self.assignment_candidats.get(person=person)
         candidate.elected = value
         candidate.save()
 
-    def is_elected(self, user):
-        return user in self.elected
+    def is_elected(self, person):
+        return person in self.elected
 
     def gen_poll(self):
         poll = AssignmentPoll(assignment=self)
         poll.save()
-        poll.set_options([{'candidate': user} for user in self.candidates])
+        poll.set_options([{'candidate': person} for person in self.candidates])
         return poll
 
 
@@ -228,7 +227,7 @@ class AssignmentVote(BaseVote):
 
 class AssignmentOption(BaseOption):
     poll = models.ForeignKey('AssignmentPoll')
-    candidate = UserField()
+    candidate = PersonField()
     vote_class = AssignmentVote
 
     def __unicode__(self):
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 5176bbdbf..64ff83866 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -21,36 +21,36 @@
             {% endfor %}
         </tr>
         {% for form in forms %}
-        <tr>
-            <td>{{ form.option }}</td>
-            {% for value in form %}
-            <td>
-                {{ value.errors }}
-                {{ value }}
-            </td>
+            <tr>
+                <td>{{ form.option }}</td>
+                {% for value in form %}
+                <td>
+                    {{ value.errors }}
+                    {{ value }}
+                </td>
+                {% endfor %}
+            </tr>
+        {% endfor %}
+        <tr class="total">
+            <td>{% trans "Invalid votes" %}</td>
+            {% for value in poll.get_vote_values %}
+                {% if forloop.first %}
+                    <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
+                {% else %}
+                    <td></td>
+                {% endif %}
+            {% endfor %}
+        </tr>
+        <tr class="total">
+            <td>{% trans "Votes cast" %}</td>
+            {% for value in poll.get_vote_values %}
+                {% if forloop.first %}
+                    <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
+                {% else %}
+                    <td></td>
+                {% endif %}
             {% endfor %}
         </tr>
-        {% endfor %}
-            <tr class="total">
-                <td>{% trans "Invalid votes" %}</td>
-                {% for value in poll.get_vote_values %}
-                    {% if forloop.first %}
-                        <td>{{ pollform.votesinvalid.errors }}{{ pollform.votesinvalid }}</td>
-                    {% else %}
-                        <td></td>
-                    {% endif %}
-                {% endfor %}
-            </tr>
-            <tr class="total">
-                <td>{% trans "Votes cast" %}</td>
-                {% for value in poll.get_vote_values %}
-                    {% if forloop.first %}
-                        <td>{{ pollform.votescast.errors }}{{ pollform.votescast }}</td>
-                    {% else %}
-                        <td></td>
-                    {% endif %}
-                {% endfor %}
-            </tr>
     </table>
 
     <p>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index cab930676..fc4feb615 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -35,12 +35,12 @@
 
     <h3>{% trans "Candidates" %}</h3>
     <ol>
-    {% for user in assignment.candidates %}
+    {% for person in assignment.candidates %}
         <li>
-            {{ user }}
+            {{ person }}
             {% if perms.assignment.can_manage_assignment %}
                 {% if assignment.status == "sea" or assignment.status == "vot" %}
-                    <a href="{% url assignment_delother assignment.id user.uid %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
+                    <a href="{% url assignment_delother assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
                 {% endif %}
             {% endif %}
         </li>
@@ -137,7 +137,7 @@
         <td class="candidate">
             {% if candidate in assignment.elected %}
                 {% if perms.assignment.can_manage_assignment %}
-                    <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.uid %}'></a>
+                    <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.person_id %}'></a>
                 {% else %}
                     <a class="elected">
                         <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Candidate is elected' %}">
@@ -145,7 +145,7 @@
                 {% endif %}
             {% else %}
                 {% if perms.assignment.can_manage_assignment %}
-                    <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.uid %}'></a>
+                    <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.person_id %}'></a>
                 {% endif %}
             {% endif %}
             {{ candidate }}
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 6320c459b..324ecb79c 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -30,12 +30,11 @@ from openslides.utils.template import Tab
 from openslides.utils.utils import (template, permission_required,
     gen_confirm_form, del_confirm_form, ajax_request)
 from openslides.utils.views import FormView, DeleteView, PDFView, RedirectView
-from openslides.utils.user import get_user
+from openslides.utils.person import get_person
 
 from openslides.config.models import config
 
-from openslides.participant.models import Profile
-from openslides.participant.api import user2djangouser
+from openslides.participant.models import OpenSlidesUser
 
 from openslides.projector.projector import Widget
 
@@ -98,7 +97,7 @@ def view(request, assignment_id=None):
         polls = assignment.poll_set.all()
         vote_results = assignment.vote_results(only_published=False)
 
-    user = user2djangouser(request.user)
+    user = request.user.openslidesuser
     return {
         'assignment': assignment,
         'form': form,
@@ -174,7 +173,7 @@ def set_status(request, assignment_id=None, status=None):
 def run(request, assignment_id):
     assignment = Assignment.objects.get(pk=assignment_id)
     try:
-        assignment.run(user2djangouser(request.user), request.user)
+        assignment.run(request.user.openslidesuser, request.user)
         messages.success(request, _('You have set your candidature successfully.') )
     except NameError, e:
         messages.error(request, e)
@@ -186,7 +185,7 @@ def delrun(request, assignment_id):
     assignment = Assignment.objects.get(pk=assignment_id)
     try:
         if assignment.status == 'sea' or user.has_perm("assignment.can_manage_assignment"):
-            assignment.delrun(user2djangouser(request.user))
+            assignment.delrun(request.user.openslidesuser)
         else:
             messages.error(request, _('The candidate list is already closed.'))
     except Exception, e:
@@ -199,19 +198,19 @@ def delrun(request, assignment_id):
 @permission_required('assignment.can_manage_assignment')
 def delother(request, assignment_id, user_id):
     assignment = Assignment.objects.get(pk=assignment_id)
-    user = get_user(user_id)
+    person = get_person(user_id)
 
     if request.method == 'POST':
         try:
-            assignment.delrun(user)
+            assignment.delrun(person)
         except Exception, e:
             messages.error(request, e)
         else:
-            messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (user))
+            messages.success(request, _("Candidate <b>%s</b> was withdrawn successfully.") % (person))
     else:
         gen_confirm_form(request,
            _("Do you really want to withdraw <b>%s</b> from the election?") \
-            % user, reverse('assignment_delother', args=[assignment_id, user_id]))
+            % person, reverse('assignment_delother', args=[assignment_id, user_id]))
     return redirect(reverse('assignment_view', args=[assignment_id]))
 
 
@@ -273,15 +272,15 @@ def set_publish_status(request, poll_id):
 @permission_required('assignment.can_manage_assignment')
 def set_elected(request, assignment_id, user_id, elected=True):
     assignment = Assignment.objects.get(pk=assignment_id)
-    user = get_user(user_id)
-    assignment.set_elected(user, elected)
+    person = get_person(user_id)
+    assignment.set_elected(person, elected)
 
     if request.is_ajax():
         if elected:
-            link = reverse('assignment_user_not_elected', args=[assignment.id, user.uid])
+            link = reverse('assignment_user_not_elected', args=[assignment.id, person.person_id])
             text = _('not elected')
         else:
-            link = reverse('assignment_user_elected', args=[assignment.id, user.uid])
+            link = reverse('assignment_user_elected', args=[assignment.id, person.person_id])
             text = _('elected')
         return ajax_request({'elected': elected, 'link': link, 'text': text})
 
@@ -554,8 +553,8 @@ class AssignmentPollPDF(PDFView):
                 candidate = option.candidate
                 cell.append(Paragraph(candidate.user.get_full_name(),
                     stylesheet['Ballot_option_name']))
-                if candidate.group:
-                    cell.append(Paragraph("(%s)" % candidate.group,
+                if candidate.name_surfix:
+                    cell.append(Paragraph("(%s)" % candidate.name_surfix,
                         stylesheet['Ballot_option_group']))
                 else:
                     cell.append(Paragraph("&nbsp;",
diff --git a/openslides/openslides_settings.py b/openslides/openslides_settings.py
index ed2b0145e..b3f14315f 100755
--- a/openslides/openslides_settings.py
+++ b/openslides/openslides_settings.py
@@ -21,7 +21,6 @@ def _fs2unicode(s):
 
 SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
 
-AUTH_PROFILE_MODULE = 'participant.Profile'
 AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',
     'openslides.utils.auth.AnonymousAuth',)
 
@@ -124,6 +123,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'mptt',
+    'openslides.utils',
     'openslides.poll',
     'openslides.projector',
     'openslides.agenda',
diff --git a/openslides/participant/api.py b/openslides/participant/api.py
index 77104b98b..d2919821b 100644
--- a/openslides/participant/api.py
+++ b/openslides/participant/api.py
@@ -15,8 +15,8 @@ import string
 
 from django.contrib.auth.models import User
 
-from openslides.utils.user import get_user
-from openslides.participant.models import Profile
+from openslides.utils.person import get_person
+from openslides.participant.models import OpenSlidesUser
 
 
 def gen_password():
@@ -47,11 +47,3 @@ def gen_username(first_name, last_name):
             User.objects.get(username=testname)
         except User.DoesNotExist:
             return testname
-
-
-def user2djangouser(user):
-    u = get_user('djangouser:%d' % user.id)
-    try:
-        return u.profile
-    except Profile.DoesNotExist:
-        return u
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 610e17b2b..e597bc5aa 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -17,7 +17,7 @@ from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
 from openslides.utils.forms import CssClassMixin, LocalizedModelMultipleChoiceField
 
-from openslides.participant.models import Profile
+from openslides.participant.models import OpenSlidesUser
 
 
 USER_APPLICATION_IMPORT_OPTIONS = [
@@ -62,9 +62,9 @@ class UsernameForm(forms.ModelForm, CssClassMixin):
             'date_joined', 'user_permissions')
 
 
-class ProfileForm(forms.ModelForm, CssClassMixin):
+class OpenSlidesUserForm(forms.ModelForm, CssClassMixin):
     class Meta:
-        model = Profile
+        model = OpenSlidesUser
 
 
 class GroupForm(forms.ModelForm, CssClassMixin):
diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index 1913da474..391dfa375 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -12,18 +12,18 @@
 
 from django.contrib.auth.models import User, Group
 from django.db import models
-from django.db.models import Q
+from django.db.models import Q, signals
 from django.dispatch import receiver
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
-from openslides.utils.user import UserMixin
-from openslides.utils.user.signals import receiv_users
+from openslides.utils.person import PersonMixin
+from openslides.utils.person.signals import receiv_persons
 
 from openslides.config.signals import default_config_value
 
 
-class Profile(models.Model, UserMixin):
-    user_prefix = 'participant'
+class OpenSlidesUser(models.Model, PersonMixin):
+    person_prefix = 'openslides_user'
     GENDER_CHOICES = (
         ('male', _('Male')),
         ('female', _('Female')),
@@ -36,8 +36,8 @@ class Profile(models.Model, UserMixin):
     )
 
     user = models.OneToOneField(User, unique=True, editable=False)
-    group = models.CharField(max_length=100, null=True, blank=True,
-        verbose_name = _("Group"), help_text=_('Shown behind the name.'))
+    name_surfix = models.CharField(max_length=100, null=True, blank=True,
+        verbose_name = _("Name Surfix"), help_text=_('Shown behind the name.'))
     gender = models.CharField(max_length=50, choices=GENDER_CHOICES, blank=True,
         verbose_name = _("Gender"),
         help_text=_('Only for filter the userlist.'))
@@ -76,76 +76,56 @@ class Profile(models.Model, UserMixin):
             return ('user_delete', [str(self.user.id)])
 
     def __unicode__(self):
-        if self.group:
-            return "%s (%s)" % (self.user.get_full_name(), self.group)
+        if self.name_surfix:
+            return "%s (%s)" % (self.user.get_full_name(), self.name_surfix)
         return "%s" % self.user.get_full_name()
 
 
     class Meta:
+        # Rename permissions
         permissions = (
             ('can_see_participant', ugettext_noop("Can see participant")),
             ('can_manage_participant', ugettext_noop("Can manage participant")),
         )
 
 
-class DjangoGroup(models.Model, UserMixin):
-    user_prefix = 'djangogroup'
+class OpenSlidesGroup(models.Model, PersonMixin):
+    person_prefix = 'openslides_group'
 
     group = models.OneToOneField(Group)
+    group_as_person = models.BooleanField(default=False)
 
     def __unicode__(self):
         return unicode(self.group)
 
 
-class DjangoUser(User, UserMixin):
-    user_prefix = 'djangouser'
-
-    def has_no_profile(self):
-        # TODO: Make ths with a Manager, so it does manipulate the sql query
-        return not hasattr(self, 'profile')
-
-    class Meta:
-        proxy = True
-
-
-class ParticipantUsers(object):
-    def __init__(self, user_prefix=None, id=None):
-        self.user_prefix = user_prefix
+class OpenSlidesUsersConnecter(object):
+    def __init__(self, person_prefix=None, id=None):
+        self.person_prefix = person_prefix
         self.id = id
 
     def __iter__(self):
-        if not self.user_prefix or self.user_prefix == Profile.user_prefix:
+        if not self.person_prefix or self.person_prefix == OpenSlidesUser.person_prefix:
             if self.id:
-                yield Profile.objects.get(pk=self.id)
+                yield OpenSlidesUser.objects.get(pk=self.id)
             else:
-                for profile in Profile.objects.all():
-                    yield profile
+                for user in OpenSlidesUser.objects.all():
+                    yield user
 
-        if not self.user_prefix or self.user_prefix == DjangoGroup.user_prefix:
+        if not self.person_prefix or self.person_prefix == OpenSlidesGroup.person_prefix:
             if self.id:
-                yield DjangoGroup.objects.get(pk=self.id)
+                yield OpenSlidesObject.objects.get(pk=self.id)
             else:
-                for group in DjangoGroup.objects.all():
+                for group in OpenSlidesGroup.objects.all():
                     yield group
 
-        if not self.user_prefix or self.user_prefix == DjangoUser.user_prefix:
-            if self.id:
-                yield DjangoUser.objects.get(pk=self.id)
-            else:
-                for user in DjangoUser.objects.all():
-                    if user.has_no_profile():
-                        yield user
-                    elif self.user_prefix:
-                        # If only users where requested, return the profile object.
-                        yield user.profile
-
     def __getitem__(self, key):
-        return Profile.objects.get(pk=key)
+        return OpenSlidesUser.objects.get(pk=key)
 
 
-@receiver(receiv_users, dispatch_uid="participant_profile")
-def receiv_users(sender, **kwargs):
-    return ParticipantUsers(user_prefix=kwargs['user_prefix'], id=kwargs['id'])
+@receiver(receiv_persons, dispatch_uid="participant")
+def receiv_persons(sender, **kwargs):
+    return OpenSlidesUsersConnecter(person_prefix=kwargs['person_prefix'], id=kwargs['id'])
 
 
 @receiver(default_config_value, dispatch_uid="participant_default_config")
@@ -153,8 +133,15 @@ def default_config(sender, key, **kwargs):
     """
     Default values for the participant app.
     """
+    # TODO: Rename config-vars
     return {
         'participant_pdf_system_url': 'http://example.com:8000',
         'participant_pdf_welcometext': _('Welcome to OpenSlides!'),
         'admin_password': None,
     }.get(key)
+
+
+@receiver(signals.post_save, sender=User)
+def user_post_save(sender, instance, signal, *args, **kwargs):
+    # Creates OpenSlidesUser
+    profile, new = OpenSlidesUser.objects.get_or_create(user=instance)
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 35ae94c4d..7797c4508 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -46,10 +46,10 @@ from openslides.utils.views import FormView, PDFView
 
 from openslides.config.models import config
 
-from openslides.participant.models import Profile, DjangoGroup
+from openslides.participant.models import OpenSlidesUser, OpenSlidesGroup
 from openslides.participant.api import gen_username, gen_password
 from openslides.participant.forms import (UserNewForm, UserEditForm,
-    ProfileForm, UsersettingsForm, UserImportForm, GroupForm,
+    OpenSlidesUserForm, UsersettingsForm, UserImportForm, GroupForm,
     AdminPasswordChangeForm, ConfigForm)
 
 
@@ -78,53 +78,55 @@ def get_overview(request):
 
     query = User.objects
     if 'gender' in sortfilter:
-        query = query.filter(profile__gender__iexact=sortfilter['gender'][0])
+        query = query.filter(openslidesuser__gender__iexact=sortfilter['gender'][0])
     if 'group' in sortfilter:
-        query = query.filter(profile__group__iexact=sortfilter['group'][0])
+        query = query.filter(openslidesuser__group__iexact=sortfilter['name_surfix'][0])
     if 'type' in sortfilter:
-        query = query.filter(profile__type__iexact=sortfilter['type'][0])
+        query = query.filter(openslidesuser__type__iexact=sortfilter['type'][0])
     if 'committee' in sortfilter:
         query = query. \
-            filter(profile__committee__iexact=sortfilter['committee'][0])
+            filter(openslidesuser__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', 'last_login']:
             query = query.order_by(sortfilter['sort'][0])
-        elif sortfilter['sort'][0] in ['group', 'type', 'committee', 'comment']:
-            query = query.order_by('profile__%s' % sortfilter['sort'][0])
+        elif sortfilter['sort'][0] in ['name_surfix', 'type', 'committee', 'comment']:
+            query = query.order_by('openslidesuser__%s' % sortfilter['sort'][0])
     else:
         query = query.order_by('last_name')
     if 'reverse' in sortfilter:
         query = query.reverse()
 
-    # list of filtered users (with profile)
+    # list of filtered users
     userlist = query.all()
     users = []
     for user in userlist:
         try:
-            user.get_profile()
-            users.append(user)
-        except Profile.DoesNotExist:
+            user.openslidesuser
+        except OpenSlidesUser.DoesNotExist:
             pass
-    # list of all existing users (with profile)
+        else:
+            users.append(user)
+    # list of all existing users
     allusers = []
     for user in User.objects.all():
         try:
-            user.get_profile()
-            allusers.append(user)
-        except Profile.DoesNotExist:
+            user.openslidesuser
+        except OpenSlidesUser.DoesNotExist:
             pass
+        else:
+            allusers.append(user)
     # quotient of selected users and all users
     if len(allusers) > 0:
         percent = float(len(users)) * 100 / float(len(allusers))
     else:
         percent = 0
     # list of all existing groups
-    groups = [p['group'] for p in Profile.objects.values('group') \
-        .exclude(group='').distinct()]
+    groups = [p['name_surfix'] for p in OpenSlidesUser.objects.values('name_surfix') \
+        .exclude(name_surfix='').distinct()]
     # list of all existing committees
-    committees = [p['committee'] for p in Profile.objects.values('committee') \
+    committees = [p['committee'] for p in OpenSlidesUser.objects.values('committee') \
         .exclude(committee='').distinct()]
     return {
         'users': users,
@@ -142,7 +144,7 @@ def get_overview(request):
 @template('participant/edit.html')
 def edit(request, user_id=None):
     """
-    View to create and edit users with profile.
+    View to create and edit users.
     """
     if user_id is not None:
         user = User.objects.get(id=user_id)
@@ -151,26 +153,31 @@ def edit(request, user_id=None):
 
     if request.method == 'POST':
         if user_id is None:
-            userform = UserNewForm(request.POST, prefix="user")
-            profileform = ProfileForm(request.POST, prefix="profile")
+            user_form = UserNewForm(request.POST, prefix="user")
+            openslides_user_form = OpenSlidesUserForm(request.POST, prefix="openslidesuser")
         else:
-            userform = UserEditForm(request.POST, instance=user, prefix="user")
-            profileform = ProfileForm(request.POST, instance=user.profile,
-                prefix="profile")
+            user_form = UserEditForm(request.POST, instance=user, prefix="user")
+            openslides_user_form = OpenSlidesUserForm(request.POST, instance=user.openslidesuser,
+                prefix="openslidesuser")
 
-        if userform.is_valid() and profileform.is_valid():
-            user = userform.save()
+        if user_form.is_valid() and openslides_user_form.is_valid():
+            user = user_form.save(commit=False)
             if user_id is None:
+                # TODO: call first_name and last_name though openslides_user
                 user.username = gen_username(user.first_name, user.last_name)
                 user.save()
-            profile = profileform.save(commit=False)
-            profile.user = user
+                openslides_user = user.openslidesuser
+                openslides_user_form = OpenSlidesUserForm(request.POST, instance=openslides_user, prefix="openslidesuser")
+                openslides_user_form.is_valid()
+            openslides_user = openslides_user_form.save(commit=False)
+            openslides_user.user = user
             if user_id is None:
-                if not profile.firstpassword:
-                    profile.firstpassword = gen_password()
-                profile.user.set_password(profile.firstpassword)
-                profile.user.save()
-            profile.save()
+                if not openslides_user.firstpassword:
+                    openslides_user.firstpassword = gen_password()
+                openslides_user.user.set_password(openslides_user.firstpassword)
+            # TODO: Try not to save the user object
+            openslides_user.user.save()
+            openslides_user.save()
             if user_id is None:
                 messages.success(request,
                     _('New participant was successfully created.'))
@@ -185,15 +192,15 @@ def edit(request, user_id=None):
             messages.error(request, _('Please check the form for errors.'))
     else:
         if user_id is None:
-            userform = UserNewForm(prefix="user")
-            profileform = ProfileForm(prefix="profile")
+            user_form = UserNewForm(prefix="user")
+            openslides_user_form = OpenSlidesUserForm(prefix="openslidesuser")
         else:
-            userform = UserEditForm(instance=user, prefix="user")
-            profileform = ProfileForm(instance=user.profile, prefix="profile")
-
+            user_form = UserEditForm(instance=user, prefix="user")
+            openslides_user_form = OpenSlidesUserForm(instance=user.openslidesuser, prefix="openslidesuser")
+    # TODO: rename template vars
     return {
-        'userform': userform,
-        'profileform': profileform,
+        'userform': user_form,
+        'profileform': openslides_user_form,
         'edituser': user,
     }
 
@@ -330,7 +337,7 @@ def group_edit(request, group_id=None):
         else:
             messages.error(request, _('Please check the form for errors.'))
     else:
-        if group and DjangoGroup.objects.filter(group=group).exists():
+        if group and OpenSlidesGroup.objects.filter(group=group).exists():
             initial = {'as_user': True}
         else:
             initial = {'as_user': False}
diff --git a/openslides/utils/person/__init__.py b/openslides/utils/person/__init__.py
new file mode 100644
index 000000000..e54e6258a
--- /dev/null
+++ b/openslides/utils/person/__init__.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.person
+    ~~~~~~~~~~~~~~~~~~~~~~~
+
+    Person api for OpenSlides
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from openslides.utils.person.signals import receiv_persons
+from openslides.utils.person.api import generate_person_id, get_person, Persons
+from openslides.utils.person.forms import PersonFormField, MultiplePersonFormField
+from openslides.utils.person.models import PersonField, PersonMixin
+
+
+class EmtyPerson(PersonMixin):
+    @property
+    def person_id(self):
+        return 'emtyuser'
diff --git a/openslides/utils/person/api.py b/openslides/utils/person/api.py
new file mode 100644
index 000000000..59e7d7a1a
--- /dev/null
+++ b/openslides/utils/person/api.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+    openslides.utils.person.api
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Usefull functions for the OpenSlides person api.
+
+    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
+    :license: GNU GPL, see LICENSE for more details.
+"""
+
+from openslides.utils.person.signals import receiv_persons
+
+
+class Persons(object):
+    """
+    A Storage for a multiplicity of different Person-Objects.
+    """
+    def __init__(self, person_prefix=None, id=None):
+        self.person_prefix = person_prefix
+        self.id = id
+
+    def __iter__(self):
+        try:
+            return iter(self._cache)
+        except AttributeError:
+            return iter(self.iter_persons())
+
+    def __len__(self):
+        return len(list(self.__iter__()))
+
+    def __getitem__(self, key):
+        return list(self)[key]
+
+    def iter_persons(self):
+        self._cache = list()
+        for receiver, persons in receiv_persons.send(
+                sender='persons', person_prefix=self.person_prefix, id=self.id):
+            for person in persons:
+                self._cache.append(person)
+                yield person
+
+
+def generate_person_id(prefix, id):
+    if ':' in prefix:
+        raise ValueError("':' is not allowed in a the 'person_prefix'")
+    return "%s:%d" % (prefix, id)
+
+
+def split_person_id(person_id):
+    data = person_id.split(':', 1)
+    if len(data) == 2 and data[0] and data[1]:
+        return data
+    raise TypeError("Invalid person_id: '%s'" % person_id)
+
+
+def get_person(person_id):
+    try:
+        person_prefix, id = split_person_id(person_id)
+    except TypeError:
+        from openslides.utils.person import EmtyPerson
+        return EmtyPerson()
+    return Persons(person_prefix=person_prefix, id=id)[0]
diff --git a/openslides/utils/user/forms.py b/openslides/utils/person/forms.py
similarity index 66%
rename from openslides/utils/user/forms.py
rename to openslides/utils/person/forms.py
index 383754402..2330443dc 100644
--- a/openslides/utils/user/forms.py
+++ b/openslides/utils/person/forms.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-    openslides.utils.user.forms
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    openslides.utils.person.forms
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Forms and FormFields for the OpenSlides user api.
+    Forms and FormFields for the OpenSlides person api.
 
     :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
@@ -12,21 +12,21 @@
 
 from django import forms
 
-from openslides.utils.user.api import Users, get_user
+from openslides.utils.person.api import Persons, get_person
 
 
-class UserChoices(object):
+class PersonChoices(object):
     def __init__(self, field):
         self.field = field
 
     def __iter__(self):
         if self.field.empty_label is not None:
             yield (u"", self.field.empty_label)
-        for user in Users():
-            yield (user.uid, user)
+        for person in Persons():
+            yield (person.person_id, person)
 
 
-class UserFormField(forms.fields.ChoiceField):
+class PersonFormField(forms.fields.ChoiceField):
     def __init__(self, required=True, initial=None, empty_label=u"---------",
                  *args, **kwargs):
         if required and (initial is not None):
@@ -46,32 +46,32 @@ class UserFormField(forms.fields.ChoiceField):
         # the property self.choices. In this case, just return self._choices.
         if hasattr(self, '_choices'):
             return self._choices
-        return UserChoices(self)
+        return PersonChoices(self)
 
     choices = property(_get_choices, forms.fields.ChoiceField._set_choices)
 
     def to_python(self, value):
-        return get_user(value)
+        return get_person(value)
 
     def valid_value(self, value):
-        return super(UserFormField, self).valid_value(value.uid)
+        return super(PersonFormField, self).valid_value(value.person_id)
 
 
-class MultipleUserFormField(UserFormField):
+class MultiplePersonFormField(PersonFormField):
     widget = forms.widgets.SelectMultiple
 
     def __init__(self, *args, **kwargs):
-        super(MultipleUserFormField, self).__init__(empty_label=None,
+        super(MultiplePersonFormField, self).__init__(empty_label=None,
                                                     *args, **kwargs)
 
     def to_python(self, value):
         if hasattr(value, '__iter__'):
-            return [super(MultipleUserFormField, self).to_python(v)
+            return [super(MultiplePersonFormField, self).to_python(v)
                     for v in value]
-        return super(MultipleUserFormField, self).to_python(value)
+        return super(MultiplePersonFormField, self).to_python(value)
 
     def valid_value(self, value):
         if hasattr(value, '__iter__'):
-            return [super(MultipleUserFormField, self).valid_value(v)
+            return [super(MultiplePersonFormField, self).valid_value(v)
                     for v in value]
-        return super(MultipleUserFormField, self).valid_value(value)
+        return super(MultiplePersonFormField, self).valid_value(value)
diff --git a/openslides/utils/user/models.py b/openslides/utils/person/models.py
similarity index 50%
rename from openslides/utils/user/models.py
rename to openslides/utils/person/models.py
index c826be061..3df620dfd 100644
--- a/openslides/utils/user/models.py
+++ b/openslides/utils/person/models.py
@@ -1,25 +1,25 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
-    openslides.utils.user.models
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    openslides.utils.person.models
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Models and ModelFields for the OpenSlides user api.
+    Models and ModelFields for the OpenSlides person api.
 
     :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
     :license: GNU GPL, see LICENSE for more details.
 """
 from django.db import models
 
-from openslides.utils.user.forms import UserFormField
-from openslides.utils.user.api import get_user, generate_uid
+from openslides.utils.person.forms import PersonFormField
+from openslides.utils.person.api import get_person, generate_person_id
 
 
-class UserField(models.fields.Field):
+class PersonField(models.fields.Field):
     __metaclass__ = models.SubfieldBase
 
     def __init__(self, *args, **kwargs):
-        super(UserField, self).__init__(max_length=255, *args, **kwargs)
+        super(PersonField, self).__init__(max_length=255, *args, **kwargs)
         # TODO: Validate the uid
 
     def get_internal_type(self):
@@ -29,36 +29,36 @@ class UserField(models.fields.Field):
         """
         Convert string value to a User Object.
         """
-        if hasattr(value, 'uid'):
-            user = value
+        if hasattr(value, 'person_id'):
+            person = value
         else:
-            user = get_user(value)
+            person = get_person(value)
 
-        user.prepare_database_save = (
-            lambda unused: UserField().get_prep_value(user))
-        return user
+        person.prepare_database_save = (
+            lambda unused: PersonField().get_prep_value(person))
+        return person
 
     def get_prep_value(self, value):
-        return value.uid
+        return value.person_id
 
     def value_to_string(self, obj):
         value = self._get_val_from_obj(obj)
         return self.get_prep_value(value)
 
     def formfield(self, **kwargs):
-        defaults = {'form_class': UserFormField}
+        defaults = {'form_class': PersonFormField}
         defaults.update(kwargs)
-        return super(UserField, self).formfield(**defaults)
+        return super(PersonField, self).formfield(**defaults)
 
 
-class UserMixin(object):
+class PersonMixin(object):
     @property
-    def uid(self):
+    def person_id(self):
         try:
-            return generate_uid(self.user_prefix, self.pk)
+            return generate_person_id(self.person_prefix, self.pk)
         except AttributeError:
             raise AttributeError("%s has to have a attribute 'user_prefix'"
                                  % self)
 
     def __repr__(self):
-        return 'User: %s' % self.uid
+        return 'Person: %s' % self.person_id
diff --git a/openslides/utils/user/signals.py b/openslides/utils/person/signals.py
similarity index 82%
rename from openslides/utils/user/signals.py
rename to openslides/utils/person/signals.py
index 5779db7ab..5d8dba88b 100644
--- a/openslides/utils/user/signals.py
+++ b/openslides/utils/person/signals.py
@@ -12,4 +12,4 @@
 
 from django.dispatch import Signal
 
-receiv_users = Signal(providing_args=['user_prefix', 'id'])
+receiv_persons = Signal(providing_args=['person_prefix', 'id'])
diff --git a/openslides/utils/user/__init__.py b/openslides/utils/user/__init__.py
deleted file mode 100644
index 87b167d8c..000000000
--- a/openslides/utils/user/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    openslides.utils.user
-    ~~~~~~~~~~~~~~~~~~~~~
-
-    User api for OpenSlides
-
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
-    :license: GNU GPL, see LICENSE for more details.
-"""
-
-from openslides.utils.user.signals import receiv_users
-from openslides.utils.user.api import generate_uid, split_uid, get_user, Users
-from openslides.utils.user.forms import UserFormField, MultipleUserFormField
-from openslides.utils.user.models import UserField, UserMixin
-
-
-class EmtyUser(UserMixin):
-    @property
-    def uid(self):
-        return 'emtyuser'
diff --git a/openslides/utils/user/api.py b/openslides/utils/user/api.py
deleted file mode 100644
index 7e418ab61..000000000
--- a/openslides/utils/user/api.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-    openslides.utils.user.api
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    Usefull functions for the OpenSlides user api.
-
-    :copyright: 2011, 2012 by OpenSlides team, see AUTHORS.
-    :license: GNU GPL, see LICENSE for more details.
-"""
-
-from openslides.utils.user.signals import receiv_users
-
-
-class Users(object):
-    """
-    A Storage for a multiplicity of different User-Objects.
-    """
-    def __init__(self, user_prefix=None, id=None):
-        self.user_prefix = user_prefix
-        self.id = id
-
-    def __iter__(self):
-        try:
-            return iter(self._cache)
-        except AttributeError:
-            return iter(self.iter_users())
-
-    def __len__(self):
-        return len(list(self.__iter__()))
-
-    def __getitem__(self, key):
-        user_list = list(self)
-        return user_list[key]
-
-    def iter_users(self):
-        self._cache = list()
-        for receiver, users in receiv_users.send(
-                sender='users', user_prefix=self.user_prefix, id=self.id):
-            for user in users:
-                self._cache.append(user)
-                yield user
-
-
-def generate_uid(prefix, id):
-    if ':' in prefix:
-        raise ValueError("':' is not allowed in a the 'user_prefix'")
-    return "%s:%d" % (prefix, id)
-
-
-def split_uid(uid):
-    data = uid.split(':', 1)
-    if len(data) == 2 and data[0] and data[1]:
-        return data
-    raise TypeError("Invalid uid: '%s'" % uid)
-
-
-def get_user(uid):
-    try:
-        user_prefix, id = split_uid(uid)
-    except TypeError:
-        from openslides.utils.user import EmtyUser
-        return EmtyUser()
-    return Users(user_prefix=user_prefix, id=id)[0]

From f22362df9db518056a9752678adfebb79690bdaa Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 8 Aug 2012 10:07:36 +0200
Subject: [PATCH 21/23] made participant-test run again

---
 openslides/participant/models.py |  8 ++--
 openslides/participant/tests.py  | 81 +++++++++++++-------------------
 2 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index 391dfa375..b330084cf 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -51,11 +51,13 @@ class OpenSlidesUser(models.Model, PersonMixin):
     firstpassword = models.CharField(max_length=100, null=True, blank=True,
         verbose_name = _("First Password"))
 
-    def reset_password(self):
+    def reset_password(self, password=None):
         """
         Reset the password for the user to his default-password.
         """
-        self.user.set_password(self.firstpassword)
+        if password is None:
+            password = self.firstpassword
+        self.user.set_password(password)
         self.user.save()
 
     def has_perm(self, perm):
@@ -114,7 +116,7 @@ class OpenSlidesUsersConnecter(object):
 
         if not self.person_prefix or self.person_prefix == OpenSlidesGroup.person_prefix:
             if self.id:
-                yield OpenSlidesObject.objects.get(pk=self.id)
+                yield OpenSlidesGroup.objects.get(pk=self.id)
             else:
                 for group in OpenSlidesGroup.objects.all():
                     yield group
diff --git a/openslides/participant/tests.py b/openslides/participant/tests.py
index fa4026335..c7dbadf46 100644
--- a/openslides/participant/tests.py
+++ b/openslides/participant/tests.py
@@ -16,72 +16,57 @@ from django.contrib.auth.models import User, Group
 from django.db.models.query import EmptyQuerySet
 from django.contrib.auth.hashers import check_password
 
-from openslides.utils.user import get_user, Users
-from openslides.participant.api import gen_username, gen_password, user2djangouser
-from openslides.participant.models import Profile, DjangoGroup, DjangoUser
+from openslides.utils.person import get_person, Persons
+from openslides.participant.api import gen_username, gen_password
+from openslides.participant.models import OpenSlidesUser, OpenSlidesGroup
 
 
-class ParticipantTest(TestCase):
+class OpenSlidesUserTest(TestCase):
     def setUp(self):
         self.user1 = User(first_name=u'Max', last_name=u'Mustermann')
         self.user1.username = gen_username(self.user1.first_name, self.user1.last_name)
         self.user1.save()
-        self.participant1 = Profile.objects.create(user=self.user1, firstpassword=gen_password())
+        self.openslidesuser1 = self.user1.openslidesuser
+        self.openslidesuser1.firstpassword = gen_password()
+        self.openslidesuser1.save()
+        self.user1 = self.openslidesuser1.user
 
     def test_participant_user(self):
-        self.assertEqual(self.user1.profile, self.participant1)
-        self.assertEqual(self.user1, self.participant1.user)
+        self.assertEqual(self.user1.openslidesuser, self.openslidesuser1)
+        self.assertEqual(self.user1, self.openslidesuser1.user)
 
     def test_repr(self):
-        self.assertEqual(unicode(self.participant1), u'Max Mustermann')
+        self.assertEqual(unicode(self.openslidesuser1), u'Max Mustermann')
 
-    def test_group(self):
-        self.participant1.group = u'München'
-        self.participant1.save()
-        self.assertEqual(unicode(self.participant1), u'Max Mustermann (München)')
+    def test_name_surfix(self):
+        self.openslidesuser1.name_surfix = u'München'
+        self.openslidesuser1.save()
+        self.assertEqual(unicode(self.openslidesuser1), u'Max Mustermann (München)')
 
     def test_reset_password(self):
-        self.assertIsInstance(self.participant1.firstpassword, basestring)
-        self.assertEqual(len(self.participant1.firstpassword), 8)
+        self.assertIsInstance(self.openslidesuser1.firstpassword, basestring)
+        self.assertEqual(len(self.openslidesuser1.firstpassword), 8)
         self.user1.set_unusable_password()
-        self.assertFalse(self.user1.check_password(self.participant1.firstpassword))
-        self.participant1.reset_password()
-        self.assertTrue(self.user1.check_password(self.participant1.firstpassword))
+        self.assertFalse(self.user1.check_password(self.openslidesuser1.firstpassword))
+        self.openslidesuser1.reset_password()
+        self.assertTrue(self.user1.check_password(self.openslidesuser1.firstpassword))
 
-    def test_user_api(self):
-        self.assertTrue(hasattr(self.participant1, 'uid'))
-        self.assertEqual(self.participant1.uid, 'participant:1')
-        self.assertEqual(get_user('participant:1'), self.participant1)
-        self.assertEqual(len(Users()), 1)
+    def test_person_api(self):
+        self.assertTrue(hasattr(self.openslidesuser1, 'person_id'))
+        self.assertEqual(self.openslidesuser1.person_id, 'openslides_user:1')
+        self.assertEqual(get_person('openslides_user:1'), self.openslidesuser1)
+        self.assertEqual(len(Persons()), 1)
 
 
-class DjangoGroupTest(TestCase):
+class OpenSlidesGroupTest(TestCase):
     def setUp(self):
         self.group1 = Group.objects.create(name='Test Group')
-        self.djangogroup1 = DjangoGroup.objects.create(group=self.group1)
+        self.openslidesgroup1 = OpenSlidesGroup.objects.create(group=self.group1)
 
-    def test_group_djangogroup(self):
-        self.assertEqual(self.djangogroup1.group, self.group1)
+    def test_group_openslidesgroup(self):
+        self.assertEqual(self.openslidesgroup1.group, self.group1)
 
-    def test_user_api(self):
-        self.assertTrue(hasattr(self.djangogroup1, 'uid'))
-        self.assertEqual(self.djangogroup1.uid, 'djangogroup:1')
-        self.assertEqual(get_user('djangogroup:1'), self.djangogroup1)
-
-
-class DjangoUserTest(TestCase):
-    def setUp(self):
-        self.user1 = User.objects.create(username='admin')
-        self.djangouser1 = DjangoUser.objects.get(pk=1)
-
-    def test_djangouser_user(self):
-        self.assertEqual(self.user1.pk, self.djangouser1.pk)
-
-    def test_has_no_profile(self):
-        self.assertTrue(self.djangouser1.has_no_profile())
-
-    def test_user_api(self):
-        self.assertTrue(hasattr(self.djangouser1, 'uid'))
-        self.assertEqual(self.djangouser1.uid, 'djangouser:1')
-        self.assertEqual(get_user('djangouser:1'), self.djangouser1)
-        self.assertEqual(user2djangouser(self.user1), self.djangouser1)
+    def test_person_api(self):
+        self.assertTrue(hasattr(self.openslidesgroup1, 'person_id'))
+        self.assertEqual(self.openslidesgroup1.person_id, 'openslides_group:1')
+        self.assertEqual(get_person('openslides_group:1'), self.openslidesgroup1)

From d1ab2f2e8577f530fc4e619b9c6e9b48237955f3 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 8 Aug 2012 10:34:23 +0200
Subject: [PATCH 22/23] some pep8 corections for the participant app

---
 openslides/participant/forms.py  |  49 +++++++--------
 openslides/participant/models.py |  43 +++++++------
 openslides/participant/views.py  | 105 ++++++++++++++++---------------
 3 files changed, 103 insertions(+), 94 deletions(-)

diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index e597bc5aa..f39db40fb 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -15,7 +15,8 @@ from django.contrib.auth.forms import AdminPasswordChangeForm
 from django.contrib.auth.models import User, Group, Permission
 from django.utils.translation import ugettext_lazy as _, ugettext_noop
 
-from openslides.utils.forms import CssClassMixin, LocalizedModelMultipleChoiceField
+from openslides.utils.forms import (
+    CssClassMixin, LocalizedModelMultipleChoiceField)
 
 from openslides.participant.models import OpenSlidesUser
 
@@ -23,43 +24,43 @@ from openslides.participant.models import OpenSlidesUser
 USER_APPLICATION_IMPORT_OPTIONS = [
     ('REASSIGN', _('Keep applications, try to reassign submitter')),
     ('INREVIEW', _('Keep applications, set status to "needs review"')),
-    ('DISCARD' , _('Discard applications'))
+    ('DISCARD', _('Discard applications'))
 ]
 
 
 class UserNewForm(forms.ModelForm, CssClassMixin):
     first_name = forms.CharField(label=_("First name"))
     last_name = forms.CharField(label=_("Last name"))
-    groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),
-        label=_("User groups"), required=False)
-    is_active = forms.BooleanField(label=_("Active"), required=False,
-        initial=True)
+    groups = forms.ModelMultipleChoiceField(
+        queryset=Group.objects.all(), label=_("User groups"), required=False)
+    is_active = forms.BooleanField(
+        label=_("Active"), required=False, initial=True)
 
     class Meta:
         model = User
         exclude = ('username', 'password', 'is_staff', 'is_superuser',
-            'last_login', 'date_joined', 'user_permissions')
+                   'last_login', 'date_joined', 'user_permissions')
 
 
 class UserEditForm(forms.ModelForm, CssClassMixin):
     first_name = forms.CharField(label=_("First name"))
     last_name = forms.CharField(label=_("Last name"))
-    groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),
-        label=_("User groups"), required=False)
+    groups = forms.ModelMultipleChoiceField(
+        queryset=Group.objects.all(), label=_("User groups"), required=False)
     is_active = forms.BooleanField(label=_("Active"), required=False)
 
     class Meta:
         model = User
         exclude = ('password', 'is_staff', 'is_superuser', 'last_login',
-            'date_joined', 'user_permissions')
+                   'date_joined', 'user_permissions')
 
 
 class UsernameForm(forms.ModelForm, CssClassMixin):
     class Meta:
         model = User
         exclude = ('first_name', 'last_name', 'email', 'is_active',
-            'is_superuser', 'groups', 'password', 'is_staff', 'last_login',
-            'date_joined', 'user_permissions')
+                   'is_superuser', 'groups', 'password', 'is_staff',
+                   'last_login', 'date_joined', 'user_permissions')
 
 
 class OpenSlidesUserForm(forms.ModelForm, CssClassMixin):
@@ -68,8 +69,8 @@ class OpenSlidesUserForm(forms.ModelForm, CssClassMixin):
 
 
 class GroupForm(forms.ModelForm, CssClassMixin):
-    as_user = forms.BooleanField(initial=False, required=False,
-        label=_("Treat Group as User"),
+    as_user = forms.BooleanField(
+        initial=False, required=False, label=_("Treat Group as User"),
         help_text=_("The Group will appear on any place, other user does."))
     permissions = LocalizedModelMultipleChoiceField(
         queryset=Permission.objects.all(), label=_("Persmissions"))
@@ -77,8 +78,8 @@ class GroupForm(forms.ModelForm, CssClassMixin):
     def __init__(self, *args, **kwargs):
         super(GroupForm, self).__init__(*args, **kwargs)
         if kwargs.get('instance', None) is not None:
-            self.fields['permissions'].initial = \
-                [p.pk for p in kwargs['instance'].permissions.all()]
+            self.fields['permissions'].initial = (
+                [p.pk for p in kwargs['instance'].permissions.all()])
 
     class Meta:
         model = Group
@@ -92,13 +93,11 @@ class UsersettingsForm(forms.ModelForm, CssClassMixin):
 
 
 class UserImportForm(forms.Form, CssClassMixin):
-    csvfile = forms.FileField(widget=forms.FileInput(attrs={'size':'50'}),
-        label=_("CSV File"))
+    csvfile = forms.FileField(widget=forms.FileInput(attrs={'size': '50'}),
+                              label=_("CSV File"))
     application_handling = forms.ChoiceField(
-        required=True,
-        choices=USER_APPLICATION_IMPORT_OPTIONS,
-        label=_("For existing applications"),
-    )
+        required=True, choices=USER_APPLICATION_IMPORT_OPTIONS,
+        label=_("For existing applications"))
 
 
 class ConfigForm(forms.Form, CssClassMixin):
@@ -106,11 +105,9 @@ class ConfigForm(forms.Form, CssClassMixin):
         widget=forms.TextInput(),
         required=False,
         label=_("System URL"),
-        help_text=_("Printed in PDF of first time passwords only."),
-    )
+        help_text=_("Printed in PDF of first time passwords only."))
     participant_pdf_welcometext = forms.CharField(
         widget=forms.Textarea(),
         required=False,
         label=_("Welcome text"),
-        help_text=_("Printed in PDF of first time passwords only."),
-    )
+        help_text=_("Printed in PDF of first time passwords only."))
diff --git a/openslides/participant/models.py b/openslides/participant/models.py
index b330084cf..f7685994e 100644
--- a/openslides/participant/models.py
+++ b/openslides/participant/models.py
@@ -36,20 +36,24 @@ class OpenSlidesUser(models.Model, PersonMixin):
     )
 
     user = models.OneToOneField(User, unique=True, editable=False)
-    name_surfix = models.CharField(max_length=100, null=True, blank=True,
-        verbose_name = _("Name Surfix"), help_text=_('Shown behind the name.'))
-    gender = models.CharField(max_length=50, choices=GENDER_CHOICES, blank=True,
-        verbose_name = _("Gender"),
+    name_surfix = models.CharField(
+        max_length=100, null=True, blank=True, verbose_name=_("Name Surfix"),
+        help_text=_('Shown behind the name.'))
+    gender = models.CharField(
+        max_length=50, choices=GENDER_CHOICES, blank=True,
+        verbose_name=_("Gender"), help_text=_('Only for filter the userlist.'))
+    type = models.CharField(
+        max_length=100, choices=TYPE_CHOICE, blank=True,
+        verbose_name=_("Typ"), help_text=_('Only for filter the userlist.'))
+    committee = models.CharField(
+        max_length=100, null=True, blank=True, verbose_name=_("Committee"),
         help_text=_('Only for filter the userlist.'))
-    type = models.CharField(max_length=100, choices=TYPE_CHOICE, blank=True,
-        verbose_name = _("Typ"), help_text=_('Only for filter the userlist.'))
-    committee = models.CharField(max_length=100, null=True, blank=True,
-        verbose_name = _("Committee"),
-        help_text=_('Only for filter the userlist.'))
-    comment = models.TextField(null=True, blank=True,
-        verbose_name = _('Comment'), help_text=_('Only for notes.'))
-    firstpassword = models.CharField(max_length=100, null=True, blank=True,
-        verbose_name = _("First Password"))
+    comment = models.TextField(
+        null=True, blank=True, verbose_name=_('Comment'),
+        help_text=_('Only for notes.'))
+    firstpassword = models.CharField(
+        max_length=100, null=True, blank=True,
+        verbose_name=_("First Password"))
 
     def reset_password(self, password=None):
         """
@@ -82,12 +86,12 @@ class OpenSlidesUser(models.Model, PersonMixin):
             return "%s (%s)" % (self.user.get_full_name(), self.name_surfix)
         return "%s" % self.user.get_full_name()
 
-
     class Meta:
         # Rename permissions
         permissions = (
             ('can_see_participant', ugettext_noop("Can see participant")),
-            ('can_manage_participant', ugettext_noop("Can manage participant")),
+            ('can_manage_participant',
+                ugettext_noop("Can manage participant")),
         )
 
 
@@ -107,14 +111,16 @@ class OpenSlidesUsersConnecter(object):
         self.id = id
 
     def __iter__(self):
-        if not self.person_prefix or self.person_prefix == OpenSlidesUser.person_prefix:
+        if (not self.person_prefix or
+                self.person_prefix == OpenSlidesUser.person_prefix):
             if self.id:
                 yield OpenSlidesUser.objects.get(pk=self.id)
             else:
                 for user in OpenSlidesUser.objects.all():
                     yield user
 
-        if not self.person_prefix or self.person_prefix == OpenSlidesGroup.person_prefix:
+        if (not self.person_prefix or
+                self.person_prefix == OpenSlidesGroup.person_prefix):
             if self.id:
                 yield OpenSlidesGroup.objects.get(pk=self.id)
             else:
@@ -127,7 +133,8 @@ class OpenSlidesUsersConnecter(object):
 
 @receiver(receiv_persons, dispatch_uid="participant")
 def receiv_persons(sender, **kwargs):
-    return OpenSlidesUsersConnecter(person_prefix=kwargs['person_prefix'], id=kwargs['id'])
+    return OpenSlidesUsersConnecter(person_prefix=kwargs['person_prefix'],
+                                    id=kwargs['id'])
 
 
 @receiver(default_config_value, dispatch_uid="participant_default_config")
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 7797c4508..728965c55 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -18,13 +18,14 @@ from urllib import urlencode
 
 try:
     from urlparse import parse_qs
-except ImportError: # python <= 2.5 grab it from cgi
+except ImportError:  # python <= 2.5 grab it from cgi
     from cgi import parse_qs
 
 from reportlab.lib import colors
 from reportlab.lib.units import cm
-from reportlab.platypus import (SimpleDocTemplate, PageBreak, Paragraph,
-    LongTable, Spacer, Table, TableStyle)
+from reportlab.platypus import (
+    SimpleDocTemplate, PageBreak, Paragraph, LongTable, Spacer, Table,
+    TableStyle)
 
 from django.db import transaction
 from django.contrib import messages
@@ -39,18 +40,18 @@ from django.utils.translation import ugettext as _, ungettext, ugettext_lazy
 from openslides.utils import csv_ext
 from openslides.utils.pdf import stylesheet
 from openslides.utils.template import Tab
-from openslides.utils.utils import (template, permission_required,
-    gen_confirm_form, ajax_request, decodedict, encodedict,
-    delete_default_permissions, html_strong)
+from openslides.utils.utils import (
+    template, permission_required, gen_confirm_form, ajax_request, decodedict,
+    encodedict, delete_default_permissions, html_strong)
 from openslides.utils.views import FormView, PDFView
 
 from openslides.config.models import config
 
 from openslides.participant.models import OpenSlidesUser, OpenSlidesGroup
 from openslides.participant.api import gen_username, gen_password
-from openslides.participant.forms import (UserNewForm, UserEditForm,
-    OpenSlidesUserForm, UsersettingsForm, UserImportForm, GroupForm,
-    AdminPasswordChangeForm, ConfigForm)
+from openslides.participant.forms import (
+    UserNewForm, UserEditForm, OpenSlidesUserForm, UsersettingsForm,
+    UserImportForm, GroupForm, AdminPasswordChangeForm, ConfigForm)
 
 
 @permission_required('participant.can_see_participant')
@@ -78,21 +79,26 @@ def get_overview(request):
 
     query = User.objects
     if 'gender' in sortfilter:
-        query = query.filter(openslidesuser__gender__iexact=sortfilter['gender'][0])
+        query = query.filter(
+            openslidesuser__gender__iexact=sortfilter['gender'][0])
     if 'group' in sortfilter:
-        query = query.filter(openslidesuser__group__iexact=sortfilter['name_surfix'][0])
+        query = query.filter(
+            openslidesuser__group__iexact=sortfilter['name_surfix'][0])
     if 'type' in sortfilter:
-        query = query.filter(openslidesuser__type__iexact=sortfilter['type'][0])
+        query = query.filter(
+            openslidesuser__type__iexact=sortfilter['type'][0])
     if 'committee' in sortfilter:
-        query = query. \
-            filter(openslidesuser__committee__iexact=sortfilter['committee'][0])
+        query = query.filter(
+            openslidesuser__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', 'last_login']:
             query = query.order_by(sortfilter['sort'][0])
-        elif sortfilter['sort'][0] in ['name_surfix', 'type', 'committee', 'comment']:
-            query = query.order_by('openslidesuser__%s' % sortfilter['sort'][0])
+        elif (sortfilter['sort'][0] in
+                ['name_surfix', 'type', 'committee', 'comment']):
+            query = query.order_by(
+                'openslidesuser__%s' % sortfilter['sort'][0])
     else:
         query = query.order_by('last_name')
     if 'reverse' in sortfilter:
@@ -123,10 +129,10 @@ def get_overview(request):
     else:
         percent = 0
     # list of all existing groups
-    groups = [p['name_surfix'] for p in OpenSlidesUser.objects.values('name_surfix') \
+    groups = [p['name_surfix'] for p in OpenSlidesUser.objects.values('name_surfix')
         .exclude(name_surfix='').distinct()]
     # list of all existing committees
-    committees = [p['committee'] for p in OpenSlidesUser.objects.values('committee') \
+    committees = [p['committee'] for p in OpenSlidesUser.objects.values('committee')
         .exclude(committee='').distinct()]
     return {
         'users': users,
@@ -303,7 +309,7 @@ def group_edit(request, group_id=None):
                     _('Group name "%s" is reserved for internal use.')
                     % group_name)
                 return {
-                    'form' : form,
+                    'form': form,
                     'group': group
                 }
 
@@ -317,7 +323,6 @@ def group_edit(request, group_id=None):
             elif not form.cleaned_data['as_user'] and django_group:
                 django_group.delete()
 
-
             if anonymous_group is not None and \
                anonymous_group.id == group.id:
                 # prevent name changes -
@@ -373,7 +378,7 @@ def user_settings(request):
     Edit own user account.
     """
     if request.method == 'POST':
-        form_user = UsersettingsForm(request.POST,instance=request.user)
+        form_user = UsersettingsForm(request.POST, instance=request.user)
         if form_user.is_valid():
             form_user.save()
             messages.success(request, _('User settings successfully saved.'))
@@ -633,7 +638,7 @@ class ParticipantsListPDF(PDFView):
     document_title = ugettext_lazy('List of Participants')
 
     def append_to_pdf(self, story):
-        data= [['#', _('Last Name'), _('First Name'), _('Group'), _('Type'),
+        data = [['#', _('Last Name'), _('First Name'), _('Group'), _('Type'),
             _('Committee')]]
         sort = 'last_name'
         counter = 0
@@ -641,27 +646,27 @@ class ParticipantsListPDF(PDFView):
             try:
                 counter += 1
                 user.get_profile()
-                data.append([counter,
+                data.append([
+                    counter,
                     Paragraph(user.last_name, stylesheet['Tablecell']),
                     Paragraph(user.first_name, stylesheet['Tablecell']),
                     Paragraph(user.profile.group, stylesheet['Tablecell']),
                     Paragraph(user.profile.get_type_display(),
                         stylesheet['Tablecell']),
-                    Paragraph(user.profile.committee, stylesheet['Tablecell']),
-                    ])
+                    Paragraph(user.profile.committee, stylesheet['Tablecell'])
+                ])
             except Profile.DoesNotExist:
                 counter -= 1
                 pass
         t = LongTable(data,
             style=[
-                ('VALIGN',(0,0),(-1,-1), 'TOP'),
-                ('LINEABOVE',(0,0),(-1,0),2,colors.black),
-                ('LINEABOVE',(0,1),(-1,1),1,colors.black),
-                ('LINEBELOW',(0,-1),(-1,-1),2,colors.black),
+                ('VALIGN', (0, 0), (-1, -1), 'TOP'),
+                ('LINEABOVE', (0, 0), (-1, 0), 2, colors.black),
+                ('LINEABOVE', (0, 1), (-1, 1), 1, colors.black),
+                ('LINEBELOW', (0, -1), (-1, -1), 2, colors.black),
                 ('ROWBACKGROUNDS', (0, 1), (-1, -1),
-                    (colors.white, (.9, .9, .9))),
-                ])
-        t._argW[0]=0.75*cm
+                    (colors.white, (.9, .9, .9)))])
+        t._argW[0] = 0.75 * cm
         story.append(t)
 
 
@@ -681,48 +686,48 @@ class ParticipantsPasswordsPDF(PDFView):
         pdf_document.build(story)
 
     def append_to_pdf(self, story):
-        data= []
+        data = []
         participant_pdf_system_url = config["participant_pdf_system_url"]
         participant_pdf_welcometext = config["participant_pdf_welcometext"]
         for user in User.objects.all().order_by('last_name'):
             try:
                 user.get_profile()
                 cell = []
-                cell.append(Spacer(0,0.8*cm))
+                cell.append(Spacer(0, 0.8 * cm))
                 cell.append(Paragraph(_("Account for OpenSlides"),
-                    stylesheet['Ballot_title']))
+                            stylesheet['Ballot_title']))
                 cell.append(Paragraph(_("for %s") % (user.profile),
-                    stylesheet['Ballot_subtitle']))
-                cell.append(Spacer(0,0.5*cm))
+                            stylesheet['Ballot_subtitle']))
+                cell.append(Spacer(0, 0.5 * cm))
                 cell.append(Paragraph(_("User: %s") % (user.username),
-                    stylesheet['Monotype']))
+                            stylesheet['Monotype']))
                 cell.append(Paragraph(_("Password: %s")
                     % (user.profile.firstpassword), stylesheet['Monotype']))
-                cell.append(Spacer(0,0.5*cm))
+                cell.append(Spacer(0, 0.5 * cm))
                 cell.append(Paragraph(_("URL: %s")
                     % (participant_pdf_system_url),
                     stylesheet['Ballot_option']))
-                cell.append(Spacer(0,0.5*cm))
+                cell.append(Spacer(0, 0.5 * cm))
                 cell2 = []
-                cell2.append(Spacer(0,0.8*cm))
+                cell2.append(Spacer(0, 0.8 * cm))
                 if participant_pdf_welcometext is not None:
                     cell2.append(Paragraph(
-                        participant_pdf_welcometext.replace('\r\n','<br/>'),
+                        participant_pdf_welcometext.replace('\r\n', '<br/>'),
                         stylesheet['Ballot_subtitle']))
 
-                data.append([cell,cell2])
-            except Profile.DoesNotExist:
+                data.append([cell, cell2])
+            except OpenSlidesUser.DoesNotExist:
                 pass
         # add empty table line if no participants available
         if data == []:
-            data.append(['',''])
+            data.append(['', ''])
         # build table
-        t=Table(data, 10.5*cm, 7.42*cm)
+        t = Table(data, 10.5 * cm, 7.42 * cm)
         t.setStyle(TableStyle([
-            ('LINEBELOW', (0,0), (-1,0), 0.25, colors.grey),
-            ('LINEBELOW', (0,1), (-1,1), 0.25, colors.grey),
-            ('LINEBELOW', (0,1), (-1,-1), 0.25, colors.grey),
-            ('VALIGN', (0,0), (-1,-1), 'TOP'),
+            ('LINEBELOW', (0, 0), (-1, 0), 0.25, colors.grey),
+            ('LINEBELOW', (0, 1), (-1, 1), 0.25, colors.grey),
+            ('LINEBELOW', (0, 1), (-1, -1), 0.25, colors.grey),
+            ('VALIGN', (0, 0), (-1, -1), 'TOP'),
         ]))
         story.append(t)
 

From 75443808af63fb2dc555f7c5a68d47a5b399e397 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 8 Aug 2012 10:52:13 +0200
Subject: [PATCH 23/23] fix some errors in participant

---
 openslides/assignment/views.py                            | 2 +-
 .../participant/templates/participant/overview.html       | 8 ++++----
 openslides/participant/views.py                           | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index 324ecb79c..96a37bb14 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -412,7 +412,7 @@ class AssignmentPDF(PDFView):
 
 
         # Add result rows
-        elected_candidates = assignment.elected.all()
+        elected_candidates = list(assignment.elected)
         for candidate, poll_list in vote_results.iteritems():
             row = []
 
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index dadbb48df..f068dd69c 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -77,11 +77,11 @@
         <tr class="{% cycle '' 'odd' %}">
             <td>{{ user.first_name }}</td>
             <td>{{ user.last_name }}</td>
-            <td>{{ user.profile.group }}</td>
-            <td>{{ user.profile.get_type_display }}</td>
-            <td>{{ user.profile.committee }}</td>
+            <td>{{ user.openslidesuser.name_surfix }}</td>
+            <td>{{ user.openslidesuser.get_type_display }}</td>
+            <td>{{ user.openslidesuser.committee }}</td>
             {% if perms.participant.can_manage_participant %}
-            <td>{{ user.profile.comment|first_line }}</td>
+            <td>{{ user.openslidesuser.comment|first_line }}</td>
             <td>{% if user.last_login > user.date_joined %}
                 {{ user.last_login }}
                 {% endif %}</td>
diff --git a/openslides/participant/views.py b/openslides/participant/views.py
index 728965c55..3fd5f6a55 100644
--- a/openslides/participant/views.py
+++ b/openslides/participant/views.py
@@ -83,7 +83,7 @@ def get_overview(request):
             openslidesuser__gender__iexact=sortfilter['gender'][0])
     if 'group' in sortfilter:
         query = query.filter(
-            openslidesuser__group__iexact=sortfilter['name_surfix'][0])
+            openslidesuser__name_surfix__iexact=sortfilter['group'][0])
     if 'type' in sortfilter:
         query = query.filter(
             openslidesuser__type__iexact=sortfilter['type'][0])
@@ -315,11 +315,11 @@ def group_edit(request, group_id=None):
 
             group = form.save()
             try:
-                django_group = DjangoGroup.objects.get(group=group)
-            except DjangoGroup.DoesNotExist:
+                openslides_group = OpenSlidesGroup.objects.get(group=group)
+            except OpenSlidesGroup.DoesNotExist:
                 django_group = None
             if form.cleaned_data['as_user'] and django_group is None:
-                DjangoGroup(group=group).save()
+                OpenSlidesGroup(group=group).save()
             elif not form.cleaned_data['as_user'] and django_group:
                 django_group.delete()