Adapt forms, wizards, views, urls for new management of documents (refs #4107)

1 files changed, 6 insertions, 57 deletions

diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py
index f1c3913c7..787b76b31 100644
--- a/archaeological_context_records/views.py
+++ b/archaeological_context_records/views.py
@@ -23,20 +23,17 @@ from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import redirect
-from django.views.generic import RedirectView
 from django.utils.translation import ugettext_lazy as _
+from django.views.generic import RedirectView
 
-from ishtar_common.forms_common import AuthorFormset
+import models
+from archaeological_operations.views import site_extra_context
+from forms import *
+from ishtar_common.utils import put_session_message
 from ishtar_common.views import get_item, show_item, revert_item, \
     IshtarMixin, LoginRequiredMixin, display_item
-from archaeological_operations.views import site_extra_context
 from ishtar_common.wizards import SearchWizard
-
-from ishtar_common.utils import put_session_message
-
 from wizards import *
-from forms import *
-import models
 
 show_contextrecord = show_item(
     models.ContextRecord, 'contextrecord',
@@ -83,13 +80,6 @@ get_contextrecord_for_ope = get_item(
     'get_contextrecord', 'contextrecord',
     own_table_cols=models.ContextRecord.TABLE_COLS_FOR_OPE)
 
-show_contextrecordsource = show_item(models.ContextRecordSource,
-                                     'contextrecordsource')
-
-get_contextrecordsource = get_item(
-    models.ContextRecordSource,
-    'get_contextrecordsource', 'contextrecordsource')
-
 get_contextrecordrelation = get_item(
     models.RecordRelationView, 'get_contextrecordrelation',
     'contextrecordrelation', specific_perms=['view_recordrelation'],
@@ -108,7 +98,6 @@ record_search_wizard = SearchWizard.as_view([
 record_creation_steps = [
     ('selec-record_creation', OperationRecordFormSelection),
     ('general-record_creation', RecordFormGeneral),
-    ('images-record_creation', ImagesFormset),
     ('datings-record_creation', DatingFormSet),
     ('interpretation-record_creation', RecordFormInterpretation),
     ('relations-record_creation', RecordRelationsFormSet),
@@ -125,7 +114,6 @@ record_modification_steps = [
     ('selec-record_modification', RecordFormSelection),
     ('operation-record_modification', OperationFormSelection),
     ('general-record_modification', RecordFormGeneral),
-    ('images-record_modification', ImagesFormset),
     ('datings-record_modification', DatingFormSet),
     ('interpretation-record_modification', RecordFormInterpretation),
     ('relations-record_modification', RecordRelationsFormSet),
@@ -161,51 +149,12 @@ record_deletion_wizard = RecordDeletionWizard.as_view([
     label=_(u"Context record deletion"),
     url_name='record_deletion',)
 
-record_source_search_wizard = SearchWizard.as_view([
-    ('selec-record_source_search', RecordSourceFormSelection)],
-    label=_(u"Context record: source search"),
-    url_name='record_source_search',)
-
-record_source_creation_wizard = RecordSourceWizard.as_view([
-    ('selec-record_source_creation', SourceRecordFormSelection),
-    ('source-record_source_creation', ContextRecordSourceForm),
-    ('authors-record_source_creation', AuthorFormset),
-    ('final-record_source_creation', FinalForm)],
-    label=_(u"Context record: new source"),
-    url_name='record_source_creation',)
-
-record_source_modification_wizard = RecordSourceWizard.as_view([
-    ('selec-record_source_modification', RecordSourceFormSelection),
-    ('source-record_source_modification', ContextRecordSourceForm),
-    ('authors-record_source_modification', AuthorFormset),
-    ('final-record_source_modification', FinalForm)],
-    label=_(u"Context record: source modification"),
-    url_name='record_source_modification',)
-
-
-def record_source_modify(request, pk):
-    record_source_modification_wizard(request)
-    RecordSourceWizard.session_set_value(
-        request, 'selec-record_source_modification', 'pk', pk, reset=True)
-    return redirect(reverse(
-        'record_source_modification',
-        kwargs={'step': 'source-record_source_modification'}))
-
-record_source_deletion_wizard = RecordSourceDeletionWizard.as_view([
-    ('selec-record_source_deletion', RecordSourceFormSelection),
-    ('final-record_source_deletion', RecordDeletionForm)],
-    label=_(u"Context record: source deletion"),
-    url_name='record_source_deletion',)
-
 
 def reset_wizards(request):
     for wizard_class, url_name in (
             (RecordWizard, 'record_creation'),
             (RecordModifWizard, 'record_modification'),
-            (RecordDeletionWizard, 'record_deletion'),
-            (RecordSourceWizard, 'record_source_creation'),
-            (RecordSourceWizard, 'record_source_modification'),
-            (RecordSourceDeletionWizard, 'record_source_deletion')):
+            (RecordDeletionWizard, 'record_deletion')):
         wizard_class.session_reset(request, url_name)