From 9b5f5ca0a065c33db57670ba166b1424bcc18cd2 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) --- archaeological_files/templates/ishtar/sheet_file.html | 1 + archaeological_files/urls.py | 2 ++ archaeological_files/views.py | 10 +++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'archaeological_files') diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 6602b8ee3..a83ce3df3 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -20,6 +20,7 @@ {% endif %}
{%trans "Export as:"%} {%trans "OpenOffice.org file"%}, {%trans "PDF file"%}
+
{% trans "Modify" %}

{% trans "General"%}

{{ item.year }}

{% if item.numeric_reference %}

{{ item.numeric_reference }}

{% endif %} diff --git a/archaeological_files/urls.py b/archaeological_files/urls.py index ee7a8ee39..694cb1791 100644 --- a/archaeological_files/urls.py +++ b/archaeological_files/urls.py @@ -38,6 +38,8 @@ urlpatterns = patterns('', views.file_creation_wizard, name='file_creation'), url(r'file_modification/(?P.+)?$', views.file_modification_wizard, name='file_modification'), + url(r'file_modify/(?P.+)/$', + views.file_modify, name='file_modify'), url(r'file_closing/(?P.+)?$', views.file_closing_wizard, name='file_closing'), url(r'file_deletion/(?P.+)?$', diff --git a/archaeological_files/views.py b/archaeological_files/views.py index 6ce194e52..b6650e7a7 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -19,9 +19,10 @@ import json +from django.core.urlresolvers import reverse from django.db.models import Q from django.http import HttpResponse -from django.shortcuts import render_to_response +from django.shortcuts import render_to_response, redirect from django.utils.translation import ugettext_lazy as _ from ishtar_common.views import get_item, show_item, revert_item @@ -137,6 +138,13 @@ file_modification_wizard = FileModificationWizard.as_view([ }, url_name='file_modification',) +def file_modify(request, pk): + view = file_modification_wizard(request) + FileModificationWizard.session_set_value( + request, 'selec-file_modification', 'pk', pk, reset=True) + return redirect(reverse('file_modification', + kwargs={'step':'general-file_modification'})) + file_closing_wizard = FileClosingWizard.as_view([ ('selec-file_closing', FileFormSelection), ('date-file_closing', ClosingDateFormSelection), -- cgit v1.2.3