Fixed pep8 errors
This commit is contained in:
parent
4cc6539f0c
commit
3ffb16d4d8
@ -8,4 +8,4 @@ install:
|
||||
- python extras/scripts/create_local_settings.py
|
||||
script:
|
||||
- coverage run ./manage.py test tests && coverage report -m
|
||||
- pep8 --max-line-length=150 --exclude="urls.py,motion/" --statistics openslides
|
||||
- pep8 --max-line-length=150 --exclude="urls.py," --statistics openslides
|
||||
|
@ -1,3 +1,2 @@
|
||||
import openslides.motion.signals
|
||||
import openslides.motion.slides
|
||||
|
||||
|
@ -340,16 +340,16 @@ class Motion(SlideMixin, models.Model):
|
||||
* reset_state
|
||||
"""
|
||||
actions = {
|
||||
'edit': (self.is_submitter(person) and
|
||||
'edit': ((self.is_submitter(person) and
|
||||
self.state.edit_as_submitter) or
|
||||
person.has_perm('motion.can_manage_motion'),
|
||||
person.has_perm('motion.can_manage_motion')),
|
||||
|
||||
'create_poll': person.has_perm('motion.can_manage_motion') and
|
||||
self.state.create_poll,
|
||||
'create_poll': (person.has_perm('motion.can_manage_motion') and
|
||||
self.state.create_poll),
|
||||
|
||||
'support': self.state.support and
|
||||
'support': (self.state.support and
|
||||
config['motion_min_supporters'] > 0 and
|
||||
not self.is_submitter(person),
|
||||
not self.is_submitter(person)),
|
||||
|
||||
'change_state': person.has_perm('motion.can_manage_motion'),
|
||||
|
||||
|
@ -338,6 +338,7 @@ def register_tab(request):
|
||||
selected=selected,
|
||||
)
|
||||
|
||||
|
||||
def get_widgets(request):
|
||||
return [Widget(
|
||||
name='motions',
|
||||
|
@ -7,6 +7,7 @@ ugettext = lambda s: s
|
||||
|
||||
_workflow = None
|
||||
|
||||
|
||||
class State(object):
|
||||
def __init__(self, id, name, next_states=[], create_poll=False, support=False,
|
||||
edit_as_submitter=False):
|
||||
@ -20,6 +21,7 @@ class State(object):
|
||||
def __unicode__(self):
|
||||
return self.name
|
||||
|
||||
|
||||
class WorkflowError(Exception):
|
||||
pass
|
||||
|
||||
@ -73,10 +75,8 @@ def populate_workflow(state, workflow):
|
||||
|
||||
DUMMY_STATE = State('dummy', ugettext('Unknwon state'))
|
||||
|
||||
default_workflow = State('pub', ugettext('Published'), support=True,
|
||||
edit_as_submitter=True, next_states=[
|
||||
State('per', ugettext('Permitted'), create_poll=True,
|
||||
edit_as_submitter=True, next_states=[
|
||||
default_workflow = State('pub', ugettext('Published'), support=True, edit_as_submitter=True, next_states=[
|
||||
State('per', ugettext('Permitted'), create_poll=True, edit_as_submitter=True, next_states=[
|
||||
State('acc', ugettext('Accepted')),
|
||||
State('rej', ugettext('Rejected')),
|
||||
State('wit', ugettext('Withdrawed')),
|
||||
|
@ -212,6 +212,7 @@ class TemplateView(PermissionMixin, ExtraContextMixin, _TemplateView):
|
||||
class ListView(PermissionMixin, SetCookieMixin, ExtraContextMixin, _ListView):
|
||||
pass
|
||||
|
||||
|
||||
class AjaxView(PermissionMixin, AjaxMixin, View):
|
||||
def get(self, request, *args, **kwargs):
|
||||
return self.ajax_get(request, *args, **kwargs)
|
||||
|
Loading…
Reference in New Issue
Block a user