diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-27 22:35:21 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-27 22:38:39 +0100 |
| commit | 9b5f5ca0a065c33db57670ba166b1424bcc18cd2 (patch) | |
| tree | 58732af3c07cfc4833e314aad8610a7d84629cca /archaeological_files | |
| parent | 0bbb58bdf1cad93846bec23d2481e5ffffa818f8 (diff) | |
| download | Ishtar-9b5f5ca0a065c33db57670ba166b1424bcc18cd2.tar.bz2 Ishtar-9b5f5ca0a065c33db57670ba166b1424bcc18cd2.zip | |
Allow modification from the window (refs #1574)
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 1 | ||||
| -rw-r--r-- | archaeological_files/urls.py | 2 | ||||
| -rw-r--r-- | archaeological_files/views.py | 10 |
3 files changed, 12 insertions, 1 deletions
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 @@ </div> {% endif %} <div class='tool'>{%trans "Export as:"%} <a href='{% url show-file item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-file item.pk "pdf" %}'>{%trans "PDF file"%}</a></div> +<div class='tool modify'><a href='{% url file_modify item.pk %}'>{% trans "Modify" %}</a></div> <h3>{% trans "General"%}</h3> <p><label>{%trans "Year:"%}</label> <span class='value'>{{ item.year }}</span></p> {% if item.numeric_reference %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value'>{{ item.numeric_reference }}</span></p>{% 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<step>.+)?$', views.file_modification_wizard, name='file_modification'), + url(r'file_modify/(?P<pk>.+)/$', + views.file_modify, name='file_modify'), url(r'file_closing/(?P<step>.+)?$', views.file_closing_wizard, name='file_closing'), url(r'file_deletion/(?P<step>.+)?$', 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), |