diff options
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_files/wizards.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index 2640aec1d..ee7a8ee39 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -53,7 +53,7 @@ urlpatterns += patterns('archaeological_files.views', name='get-file-full', kwargs={'full':True}), url(r'get-administrativeactfile/(?P<type>.+)?$', 'get_administrativeactfile', name='get-administrativeactfile'), - url(r'show-file/(?P<pk>.+)?/(?P<type>.+)?$', 'show_file', + url(r'show-file(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_file', name='show-file'), url(r'show-historized-file/(?P<pk>.+)?/(?P<date>.+)?$', 'show_file', name='show-historized-file'), diff --git a/archaeological_files/wizards.py b/archaeological_files/wizards.py index 06e3bb5ed..7fb654b0b 100644 --- a/archaeological_files/wizards.py +++ b/archaeological_files/wizards.py @@ -24,6 +24,7 @@ from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ +from ishtar_common.forms import reverse_lazy from ishtar_common.wizards import Wizard, ClosingWizard from archaeological_operations.wizards import OperationWizard,\ OperationAdministrativeActWizard,\ @@ -37,6 +38,7 @@ class FileWizard(OperationWizard): model = models.File object_parcel_type = 'associated_file' parcel_step_key = 'parcels-' + wizard_done_window = reverse_lazy('show-file') def get_form(self, step=None, data=None, files=None): """ |