Merge pull request #697 from normanjaeckel/Fix_Post_DB_Setup_Signal
Fix #696
This commit is contained in:
commit
7b93762af1
@ -136,7 +136,8 @@ def create_builtin_workflows(sender, **kwargs):
|
||||
"""
|
||||
Creates a simple and a complex workflow.
|
||||
"""
|
||||
workflow_1 = Workflow.objects.create(name=ugettext_noop('Simple Workflow'))
|
||||
workflow_1, created = Workflow.objects.get_or_create(name=ugettext_noop('Simple Workflow'))
|
||||
if created:
|
||||
state_1_1 = State.objects.create(name=ugettext_noop('submitted'),
|
||||
workflow=workflow_1,
|
||||
allow_create_poll=True,
|
||||
@ -155,7 +156,8 @@ def create_builtin_workflows(sender, **kwargs):
|
||||
workflow_1.first_state = state_1_1
|
||||
workflow_1.save()
|
||||
|
||||
workflow_2 = Workflow.objects.create(name=ugettext_noop('Complex Workflow'))
|
||||
workflow_2, created = Workflow.objects.get_or_create(name=ugettext_noop('Complex Workflow'))
|
||||
if created:
|
||||
state_2_1 = State.objects.create(name=ugettext_noop('published'),
|
||||
workflow=workflow_2,
|
||||
allow_support=True,
|
||||
|
@ -68,8 +68,9 @@ def create_builtin_groups(sender, **kwargs):
|
||||
Creates the builtin groups: Anonymous, Registered, Delegates and Staff.
|
||||
"""
|
||||
# Check whether the group pks 1 to 4 are free
|
||||
for pk in range(1, 5):
|
||||
assert not Group.objects.filter(pk=pk).exists(), 'There should not be any group with pk 1, 2, 3 or 4.'
|
||||
if Group.objects.filter(pk__in=range(1, 5)).exists():
|
||||
# Do completely nothing if there are already some of our groups in the database.
|
||||
return
|
||||
|
||||
# Anonymous and Registered
|
||||
ct_projector = ContentType.objects.get(app_label='projector', model='projectorslide')
|
||||
|
Loading…
Reference in New Issue
Block a user