diff options
Diffstat (limited to 'archaeological_operations')
| -rw-r--r-- | archaeological_operations/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_operations/wizards.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 5f52254bd..e0daa8590 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -68,7 +68,7 @@ urlpatterns += patterns('archaeological_operations.views', 'get_available_operation_code', name='get_available_operation_code'), url(r'revert-operation/(?P<pk>.+)/(?P<date>.+)$', 'revert_operation', name='revert-operation'), - url(r'show-operation/(?P<pk>.+)?/(?P<type>.+)?$', + url(r'show-operation(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_operation', name='show-operation'), url(r'show-historized-operation/(?P<pk>.+)?/(?P<date>.+)?$', 'show_operation', name='show-historized-operation'), diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py index a61452733..d816cf9aa 100644 --- a/archaeological_operations/wizards.py +++ b/archaeological_operations/wizards.py @@ -25,6 +25,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, DeletionWizard, \ SourceWizard import models @@ -34,6 +35,7 @@ class OperationWizard(Wizard): model = models.Operation object_parcel_type = 'operation' parcel_step_key = 'parcelsgeneral-' + wizard_done_window = reverse_lazy('show-operation') def get_template_names(self): templates = super(OperationWizard, self).get_template_names() |