diff options
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/urls.py | 18 | ||||
| -rw-r--r-- | archaeological_files/views.py | 13 | ||||
| -rw-r--r-- | archaeological_files/wizards.py | 2 |
3 files changed, 21 insertions, 12 deletions
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index a64a8b2b1..4c5d923a2 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -23,6 +23,15 @@ import views # forms: urlpatterns = patterns('', + url(r'file_administrativeactfile/(?P<step>.+)?$', + views.file_administrativeactfile_wizard, + name='file_administrativeactfile'), + url(r'file_administrativeactfile_deletion/(?P<step>.+)?$', + views.file_administrativeactfile_deletion_wizard, + name='file_administrativeactfile_deletion'), + url(r'file_administrativeactfile_modification/(?P<step>.+)?$', + views.file_administrativeactfile_modification_wizard, + name='file_administrativeactfile_modification'), url(r'file_search/(?P<step>.+)?$', views.file_search_wizard, name='file_search'), url(r'file_creation/(?P<step>.+)?$', @@ -33,15 +42,6 @@ urlpatterns = patterns('', views.file_closing_wizard, name='file_closing'), url(r'file_deletion/(?P<step>.+)?$', views.file_deletion_wizard, name='file_deletion'), - url(r'file_administrativeactfile/(?P<step>.+)?$', - views.file_administrativeactfile_wizard, - name='file_administrativeactfile'), - url(r'file_administrativeactfile_modification/(?P<step>.+)?$', - views.file_administrativeactfile_modification_wizard, - name='file_administrativeactfile_modification'), - url(r'file_administrativeactfile_deletion/(?P<step>.+)?$', - views.file_administrativeactfile_deletion_wizard, - name='file_administrativeactfile_deletion'), ) urlpatterns += patterns('archaeological_files.views', diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 84a42b95a..84ee84136 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -22,6 +22,7 @@ import json from django.db.models import Q from django.http import HttpResponse from django.shortcuts import render_to_response +from django.utils.translation import ugettext_lazy as _ from ishtar_common.views import get_item, show_item, revert_item from archaeological_operations.models import AdministrativeAct @@ -79,6 +80,7 @@ def dashboard_file(request, dct, obj_id=None, *args, **kwargs): file_search_wizard = SearchWizard.as_view( [('general-file_search', FileFormSelection)], + label=_(u"File search"), url_name='file_search',) file_creation_wizard = FileWizard.as_view([ ('general-file_creation', FileFormGeneral), @@ -87,11 +89,12 @@ file_creation_wizard = FileWizard.as_view([ ('parcels-file_creation', ParcelFormSet), ('preventive-file_creation', FileFormPreventive), ('final-file_creation', FinalForm)], + label=_(u"New file"), condition_dict={'preventive-file_creation':is_preventive( 'general-file_creation', models.FileType, type_key='file_type') }, - url_name='file_creation',) + url_name='file_creation',) file_modification_wizard = FileModificationWizard.as_view([ ('selec-file_modification', FileFormSelection), @@ -101,22 +104,25 @@ file_modification_wizard = FileModificationWizard.as_view([ ('parcels-file_modification', ParcelFormSet), ('preventive-file_modification', FileFormPreventive), ('final-file_modification', FinalForm)], + label=_(u"File modification"), condition_dict={'preventive-file_modification':is_preventive( 'general-file_modification', models.FileType, type_key='file_type') }, - url_name='file_modification',) + url_name='file_modification',) file_closing_wizard = FileClosingWizard.as_view([ ('selec-file_closing', FileFormSelection), ('date-file_closing', ClosingDateFormSelection), ('final-file_closing', FinalFileClosingForm)], + label=_(u"File closing"), url_name='file_closing',) file_deletion_wizard = FileDeletionWizard.as_view([ ('selec-file_deletion', FileFormSelection), ('final-file_deletion', FinalFileDeleteForm)], + label=_(u"File deletion"), url_name='file_deletion',) file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([ @@ -124,6 +130,7 @@ file_administrativeactfile_wizard = FileAdministrativeActWizard.as_view([ ('administrativeact-file_administrativeactfile', AdministrativeActFileForm), ('final-file_administrativeactfile', FinalForm)], + label=_(u"File: new administrative act"), url_name='file_administrativeactfile',) file_administrativeactfile_modification_wizard = \ @@ -133,6 +140,7 @@ file_administrativeactfile_modification_wizard = \ ('administrativeact-file_administrativeactfile_modification', AdministrativeActFileForm), ('final-file_administrativeactfile_modification', FinalForm)], + label=_(u"File: administrative act modification"), url_name='file_administrativeactfile_modification',) file_administrativeactfile_deletion_wizard = \ @@ -141,5 +149,6 @@ file_administrativeactfile_deletion_wizard = \ AdministrativeActFileFormSelection), ('final-file_administrativeactfile_deletion', FinalAdministrativeActDeleteForm)], + label=_(u"File: administrative act deletion"), url_name='file_administrativeactfile_deletion',) diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py index 0cc34ebcc..e2f6722ef 100644 --- a/archaeological_files/wizards.py +++ b/archaeological_files/wizards.py @@ -144,7 +144,7 @@ class FileDeletionWizard(FileClosingWizard): for operation in Operation.objects.filter(associated_file=obj).all(): operation.delete() obj.delete() - return render_to_response('wizard_done.html', {}, + return render_to_response('ishtar/wizard/wizard_delete_done.html', {}, context_instance=RequestContext(self.request)) |