diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-27 17:53:15 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-27 17:55:37 +0100 |
| commit | 0bbb58bdf1cad93846bec23d2481e5ffffa818f8 (patch) | |
| tree | 9ba5641662d7abeb2c690595f3255eb9df32ccc1 /archaeological_context_records | |
| parent | e027edce6edc7d8ba5a7dfc14069a95e531da2e1 (diff) | |
| download | Ishtar-0bbb58bdf1cad93846bec23d2481e5ffffa818f8.tar.bz2 Ishtar-0bbb58bdf1cad93846bec23d2481e5ffffa818f8.zip | |
Display current item window after creation and modification (refs #1574)
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_context_records/wizards.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 772938b81..75808b114 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -43,7 +43,7 @@ urlpatterns = patterns('', ) urlpatterns += patterns('archaeological_context_records.views', - url(r'show-contextrecord/(?P<pk>.+)?/(?P<type>.+)?$', + url(r'show-contextrecord(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_contextrecord', name='show-contextrecord'), url(r'show-historized-contextrecord/(?P<pk>.+)?/(?P<date>.+)?$', 'show_contextrecord', name='show-historized-contextrecord'), diff --git a/archaeological_context_records/wizards.py b/archaeological_context_records/wizards.py index 60dab44d6..cd48d1308 100644 --- a/archaeological_context_records/wizards.py +++ b/archaeological_context_records/wizards.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -23,12 +23,14 @@ 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, DeletionWizard, SourceWizard import models class RecordWizard(Wizard): model = models.ContextRecord edit = False + wizard_done_window = reverse_lazy('show-contextrecord') def get_current_operation(self): step = self.steps.current |