From 58568e150d54f4715d4bc91bf0ebefa772a39682 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 21 Oct 2012 19:24:56 +0200 Subject: Djangoization - Major refactoring (step 10) * Fix operation wizards * Minor fix on other wizards --- archaeological_warehouse/urls.py | 6 ++---- archaeological_warehouse/views.py | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'archaeological_warehouse') diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 903d77a59..e91568b1e 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -19,14 +19,13 @@ from django.conf.urls.defaults import * -""" import views # forms urlpatterns = patterns('', - url(r'treatment_creation/(?P.+)$', + url(r'treatment_creation/(?P.+)?$', views.treatment_creation_wizard, name='treatment_creation'), - url(r'warehouse_packaging/(?P.+)$', + url(r'warehouse_packaging/(?P.+)?$', views.warehouse_packaging_wizard, name='warehouse_packaging'), ) @@ -42,4 +41,3 @@ urlpatterns += patterns('archaeological_warehouse.views', url(r'autocomplete-container/?$', 'autocomplete_container', name='autocomplete-container'), ) -""" diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index 78df71bc2..f15220efe 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/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 import models -- cgit v1.2.3