diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 7917af6b8..a29ae8b15 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -33,7 +33,8 @@ from archaeological_operations.wizards import AdministrativeActDeletionWizard, \ is_preventive, is_not_preventive from ishtar_common.wizards import SearchWizard -from archaeological_files.wizards import FileSearch, FileWizard, \ +from archaeological_files import wizards +from archaeological_files.wizards import FileWizard, \ FileModificationWizard, FileClosingWizard, FileDeletionWizard, \ FileAdministrativeActWizard, FileEditAdministrativeActWizard @@ -105,11 +106,11 @@ def dashboard_file(request, *args, **kwargs): dct = {'dashboard': models.FileDashboard()} return render(request, 'ishtar/dashboards/dashboard_file.html', dct) -file_search_wizard = FileSearch.as_view( +file_search_wizard = wizards.FileSearch.as_view( [('general-file_search', forms.FileFormSelection)], label=_(u"File search"), url_name='file_search',) -file_creation_wizard = FileWizard.as_view( +file_creation_wizard = wizards.FileWizard.as_view( [('general-file_creation', forms.FileFormGeneral), ('towns-file_creation', TownFormset), ('parcels-file_creation', forms.ParcelFormset), @@ -127,7 +128,7 @@ file_creation_wizard = FileWizard.as_view( }, url_name='file_creation',) -file_modification_wizard = FileModificationWizard.as_view( +file_modification_wizard = wizards.FileModificationWizard.as_view( [('selec-file_modification', forms.FileFormSelection), ('general-file_modification', forms.FileFormGeneralRO), ('towns-file_modification', TownFormset), @@ -157,13 +158,13 @@ def file_modify(request, pk): return redirect(reverse('file_modification', kwargs={'step': 'general-file_modification'})) -file_closing_wizard = FileClosingWizard.as_view( +file_closing_wizard = wizards.FileClosingWizard.as_view( [('selec-file_closing', forms.FileFormSelection), ('date-file_closing', ClosingDateFormSelection), ('final-file_closing', forms.FinalFileClosingForm)], label=_(u"File closing"), url_name='file_closing',) -file_deletion_wizard = FileDeletionWizard.as_view( +file_deletion_wizard = wizards.FileDeletionWizard.as_view( [('selec-file_deletion', forms.FileFormMultiSelection), ('final-file_deletion', forms.FinalFileDeleteForm)], label=_(u"File deletion"), @@ -174,7 +175,7 @@ def file_delete(request, pk): if not wizard_is_available(file_deletion_wizard, request, models.File, pk): return HttpResponseRedirect("/") - FileDeletionWizard.session_set_value( + wizards.FileDeletionWizard.session_set_value( request, 'selec-file_deletion', 'pks', pk, reset=True) return redirect(reverse('file_deletion', kwargs={'step': 'final-file_deletion'})) @@ -187,7 +188,7 @@ file_administrativeactfile_search_wizard = \ url_name='file_administrativeactfile_search',) file_administrativeactfile_wizard = \ - FileAdministrativeActWizard.as_view([ + wizards.FileAdministrativeActWizard.as_view([ ('selec-file_administrativeactfile', forms.FileFormSelection), ('administrativeact-file_administrativeactfile', forms.AdministrativeActFileForm), @@ -196,7 +197,7 @@ file_administrativeactfile_wizard = \ url_name='file_administrativeactfile',) file_administrativeactfile_modification_wizard = \ - FileEditAdministrativeActWizard.as_view([ + wizards.FileEditAdministrativeActWizard.as_view([ ('selec-file_administrativeactfile_modification', forms.AdministrativeActFileModifyFormSelection), ('administrativeact-file_administrativeactfile_modification', @@ -210,7 +211,7 @@ def file_administrativeactfile_modify(request, pk): if not wizard_is_available(file_administrativeactfile_modification_wizard, request, AdministrativeAct, pk): return HttpResponseRedirect("/") - FileEditAdministrativeActWizard.session_set_value( + wizards.FileEditAdministrativeActWizard.session_set_value( request, 'selec-file_administrativeactfile_modification', 'pk', pk, reset=True) return redirect( @@ -245,6 +246,19 @@ def file_administrativeact_delete(request, pk): kwargs={'step': 'final-file_administrativeactfile_deletion'})) +def file_adminact_add(request, pk, current_right=None): + try: + models.File.objects.get(pk=pk) + except models.File.DoesNotExist: + raise Http404() + file_administrativeactfile_wizard(request) + wizards.FileAdministrativeActWizard.session_set_value( + request, 'selec-file_administrativeactfile', 'pk', pk, reset=True) + return redirect(reverse( + 'file_administrativeactfile', + kwargs={'step': 'administrativeact-file_administrativeactfile'})) + + def reset_wizards(request): for wizard_class, url_name in ( (FileWizard, 'file_creation'), |