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','
'),
+ participant_pdf_welcometext.replace('\r\n', '
'),
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)