summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-06-14 12:06:26 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-06-14 12:06:26 +0200
commitd1b6654633a1cf38dbae42f32fe955b609e312e7 (patch)
treedc277998f59aa86aa34eb4b5035e7512a7996065
parenta840ec9bea2b986049432d23872e11873545de23 (diff)
downloadIshtar-d1b6654633a1cf38dbae42f32fe955b609e312e7.tar.bz2
Ishtar-d1b6654633a1cf38dbae42f32fe955b609e312e7.zip
Fix reset for operation - cleaning
-rw-r--r--archaeological_operations/ishtar_menu.py73
-rw-r--r--archaeological_operations/tests.py50
-rw-r--r--archaeological_operations/views.py3
3 files changed, 0 insertions, 126 deletions
diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py
index e8815cbb8..8057b63c7 100644
--- a/archaeological_operations/ishtar_menu.py
+++ b/archaeological_operations/ishtar_menu.py
@@ -26,79 +26,6 @@ from archaeological_operations import models
# be careful: each access_controls must be relevant with check_rights in urls
-"""
-MenuItem(
- 'operation_modification', _(u"Modification"),
- model=models.Operation,
- access_controls=['change_operation',
- 'change_own_operation']),
-MenuItem(
- 'operation_closing', _(u"Closing"),
- model=models.Operation,
- access_controls=['close_operation']),
-MenuItem(
- 'operation_deletion', _(u"Deletion"),
- model=models.Operation,
- access_controls=['change_operation',
- 'change_own_operation']),
-SectionItem(
- 'admin_act_operations',
- _(u"Administrative act"),
- profile_restriction='files',
- childs=[
- MenuItem(
- 'operation_administrativeactop_search',
- _(u"Search"),
- model=models.AdministrativeAct,
- access_controls=[
- 'change_administrativeact']),
- MenuItem(
- 'operation_administrativeactop',
- _(u"Creation"),
- model=models.AdministrativeAct,
- access_controls=['change_administrativeact']),
- MenuItem(
- 'operation_administrativeactop_modification',
- _(u"Modification"),
- model=models.AdministrativeAct,
- access_controls=['change_administrativeact']),
- MenuItem(
- 'operation_administrativeactop_deletion',
- _(u"Deletion"),
- model=models.AdministrativeAct,
- access_controls=['change_administrativeact']),
- MenuItem(
- 'operation_administrativeact_document',
- _(u"Documents"),
- model=models.AdministrativeAct,
- access_controls=['change_administrativeact']),
- ],),
-SectionItem(
- 'operation_source', _(u"Documentation"),
- childs=[
- MenuItem('operation_source_search',
- _(u"Search"),
- model=models.OperationSource,
- access_controls=['view_operation',
- 'view_own_operation']),
- MenuItem('operation_source_creation',
- _(u"Creation"),
- model=models.OperationSource,
- access_controls=['change_operation',
- 'change_own_operation']),
- MenuItem('operation_source_modification',
- _(u"Modification"),
- model=models.OperationSource,
- access_controls=['change_operation',
- 'change_own_operation']),
- MenuItem('operation_source_deletion',
- _(u"Deletion"),
- model=models.OperationSource,
- access_controls=['change_operation',
- 'change_own_operation']),
- ])
-
-"""
MENU_SECTIONS = [
(30, SectionItem(
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index a50681667..9f08f1e48 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -2220,56 +2220,6 @@ class OperationAdminActWizardCreationTest(WizardTest, OperationInitTest,
self.number + 1)
-"""
-class OperationSourceWizardModificationTest(WizardTest, OperationInitTest,
- TestCase):
- fixtures = FILE_FIXTURES
- url_name = 'operation_source_modification'
- wizard_name = 'operation_source_wizard'
- steps = views.operation_source_modification_steps
- form_datas = [
- FormData(
- "Test remove all authors",
- form_datas={
- 'selec-operation_source_modification': {},
- 'source-operation_source_modification': {
- 'title': "New title",
- 'source_type': None,
- 'index': 42
- },
- 'authors-operation_source_modification': []
- },
- )
- ]
-
- def pre_wizard(self):
- ope = self.get_default_operation()
- self.source = models.OperationSource.objects.create(
- title="Old title", source_type=SourceType.objects.all()[0],
- operation=ope
- )
- author = Author.objects.create(
- author_type=AuthorType.objects.all()[0],
- person=Person.objects.all()[0]
- )
-
- self.source.authors.add(author)
-
- data = self.form_datas[0].form_datas
- data['selec-operation_source_modification']['pk'] = self.source.pk
-
- data['source-operation_source_modification']['hidden_operation_id'] = \
- self.source.pk
- data['source-operation_source_modification'][
- 'source_type'] = SourceType.objects.all()[1].pk
- super(OperationSourceWizardModificationTest, self).pre_wizard()
-
- def post_wizard(self):
- source = models.OperationSource.objects.get(pk=self.source.pk)
- self.assertEqual(source.authors.count(), 0)
-"""
-
-
class SiteTest(TestCase, OperationInitTest):
fixtures = FILE_FIXTURES
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 165dfd635..0721bb707 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -546,9 +546,6 @@ def reset_wizards(request):
(OperationModificationWizard, 'operation_modification'),
(OperationClosingWizard, 'operation_closing'),
(OperationDeletionWizard, 'operation_deletion_wizard'),
- (OperationSourceWizard, 'operation_source_creation'),
- (OperationSourceWizard, 'operation_source_modification'),
- (OperationSourceDeletionWizard, 'operation_source_deletion'),
(OperationAdministrativeActWizard,
'operation_administrativeactop'),
(OperationEditAdministrativeActWizard,