From 7adba01875d7b64a641d0562a9ec233de6a376cc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 27 Dec 2013 22:35:21 +0100 Subject: Allow modification from the window (refs #1574) --- .../templates/ishtar/sheet_contextrecord.html | 1 + archaeological_context_records/urls.py | 4 +++- archaeological_context_records/views.py | 9 +++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 4284b7eef..06528c4d2 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -20,6 +20,7 @@ {% endif %}
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+
{% trans "Modify" %}
{% if item.operation.code_patriarche %}

diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py index 75808b114..7d288b031 100644 --- a/archaeological_context_records/urls.py +++ b/archaeological_context_records/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2012 Étienne Loks +# Copyright (C) 2010-2013 Étienne Loks # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -29,6 +29,8 @@ urlpatterns = patterns('', views.record_creation_wizard, name='record_creation'), url(r'record_modification/(?P.+)?$', views.record_modification_wizard, name='record_modification'), + url(r'record_modify/(?P.+)/$', + views.record_modify, name='record_modify'), url(r'record_deletion/(?P.+)?$', views.record_deletion_wizard, name='record_deletion'), url(r'record_source_creation/(?P.+)?$', diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index 7f42866d8..73e1cd7b3 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -17,6 +17,8 @@ # See the file COPYING for details. +from django.core.urlresolvers import reverse +from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ from ishtar_common.views import get_item, show_item, revert_item @@ -70,6 +72,13 @@ record_modification_wizard = RecordModifWizard.as_view([ label=_(u"Context record modification"), url_name='record_modification',) +def record_modify(request, pk): + view = record_modification_wizard(request) + RecordModifWizard.session_set_value( + request, 'selec-record_modification', 'pk', pk, reset=True) + return redirect(reverse('record_modification', + kwargs={'step':'general-record_modification'})) + record_deletion_wizard = RecordDeletionWizard.as_view([ ('selec-record_deletion', RecordFormSelection), ('final-record_deletion', RecordDeletionForm)], -- cgit v1.2.3