diff options
author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 19:24:56 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-10-21 19:24:56 +0200 |
commit | 58568e150d54f4715d4bc91bf0ebefa772a39682 (patch) | |
tree | 45d5fe6bcd60fe66954db08976a649bfa9203747 /archaeological_warehouse | |
parent | 4bf634a003ab6c3d9edf1cc7fa40e7203d59711f (diff) | |
download | Ishtar-58568e150d54f4715d4bc91bf0ebefa772a39682.tar.bz2 Ishtar-58568e150d54f4715d4bc91bf0ebefa772a39682.zip |
Djangoization - Major refactoring (step 10)
* Fix operation wizards
* Minor fix on other wizards
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r-- | archaeological_warehouse/urls.py | 6 | ||||
-rw-r--r-- | archaeological_warehouse/views.py | 1 |
2 files changed, 3 insertions, 4 deletions
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<step>.+)$', + url(r'treatment_creation/(?P<step>.+)?$', views.treatment_creation_wizard, name='treatment_creation'), - url(r'warehouse_packaging/(?P<step>.+)$', + url(r'warehouse_packaging/(?P<step>.+)?$', 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 |