diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-05-17 12:15:46 +0200 |
| commit | 7d3609635c202ff36f865480bc34253041f51818 (patch) | |
| tree | e8c2da5569c0a02183c7194942d580e6a31614f4 /archaeological_operations/views.py | |
| parent | dd9d9db0388514bc474e1594cc6bc2b992fa7b42 (diff) | |
| parent | e5dc6268a843e216ccf14469447d9b6f1ad43b49 (diff) | |
| download | Ishtar-7d3609635c202ff36f865480bc34253041f51818.tar.bz2 Ishtar-7d3609635c202ff36f865480bc34253041f51818.zip | |
Merge branch 'master' into develop
Conflicts:
ishtar_common/views.py
version.py
Diffstat (limited to 'archaeological_operations/views.py')
| -rw-r--r-- | archaeological_operations/views.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index d3f239bbd..545f42b89 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -171,6 +171,7 @@ operation_search_wizard = SearchWizard.as_view( wizard_steps = [ ('filechoice-operation_creation', OperationFormFileChoice), ('general-operation_creation', OperationFormGeneral), + ('collaborators-operation_creation', CollaboratorForm), ('archaeologicalsite-operation_creation', ArchaeologicalSiteFormSet), ('preventive-operation_creation', OperationFormPreventive), ('preventivediag-operation_creation', OperationFormPreventiveDiag), @@ -227,6 +228,7 @@ operation_creation_wizard = OperationWizard.as_view( operation_modif_wizard_steps = [ ('selec-operation_modification', OperationFormSelection), ('general-operation_modification', OperationFormModifGeneral), + ('collaborators-operation_modification', CollaboratorForm), ('archaeologicalsite-operation_modification', ArchaeologicalSiteFormSet), ('preventive-operation_modification', OperationFormPreventive), ('preventivediag-operation_modification', OperationFormPreventiveDiag), |