diff options
Diffstat (limited to 'archaeological_operations')
5 files changed, 35 insertions, 16 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html index 23dc0a4c1..57acf9cbe 100644 --- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html +++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html @@ -1,13 +1,15 @@ {% extends "ishtar/sheet.html" %} -{% load i18n %} +{% load i18n window_header %} -{% block head_sheet %} -{{block.super}} -<h1>{% trans "Administrative act"%}</h1> -{% endblock %} +{% block head_title %}{% trans "Administrative act" %}{% endblock %} {% block content %} -<div class='tool'>{%trans "Export as:"%} <a href='{% url show-administrativeact item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-administrativeact item.pk "pdf" %}'>{%trans "PDF file"%}</a></div> +{% if item.operation %} +{% window_nav item window_id 'show-administrativeact' 'operation_administrativeactop_modify' %} +{% else %} +{% window_nav item window_id 'show-administrativeact' 'file_administrativeactfile_modify' %} +{% endif %} + <h3>{% trans "General"%}</h3> <p><label>{%trans "Year:"%}</label> <span class='value strong'>{{ item.year }}</span></p> {% if item.index %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value strong'>{{ item.index }}</span></p>{% endif %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 9791ffe38..f0846f11f 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -1,12 +1,10 @@ {% extends "ishtar/sheet.html" %} -{% load i18n window_tables window_ope_tables window_field from_dict %} +{% load i18n window_tables window_header window_ope_tables window_field from_dict %} -{% block head_sheet %} -{{block.super}} -<h1>{% trans "Operation"%}</h1> -{% endblock %} +{% block head_title %}{% trans "Operation" %}{% endblock %} {% block content %} +{% window_nav item window_id 'show-operation' 'operation_modify' 'show-historized-operation' 'revert-operation' previous next %} {% if previous or next %} <div class='tool'> diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource.html b/archaeological_operations/templates/ishtar/sheet_operationsource.html index 5bb8518a5..9b8cbf509 100644 --- a/archaeological_operations/templates/ishtar/sheet_operationsource.html +++ b/archaeological_operations/templates/ishtar/sheet_operationsource.html @@ -1,9 +1,10 @@ {% extends "ishtar/sheet_source.html" %} -{% load i18n window_field link_to_window %} +{% load i18n window_field window_header link_to_window %} -{% block head_sheet %} -{{block.super}} -<h1>{% trans "Operation source"%}</h1> +{% block head_title %}{% trans "Operation source" %}{% endblock %} + +{% block window_nav %} +{% window_nav item window_id 'show-operationsource' 'operation_source_modify' %} {% endblock %} {% block related %} diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index b25390bca..7d494f973 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 É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 @@ -40,6 +40,9 @@ urlpatterns = patterns( check_rights(['change_administrativeact'])( views.operation_administrativeactop_modification_wizard), name='operation_administrativeactop_modification'), + url(r'operation_administrativeactop_modify/(?P<pk>.+)/$', + views.operation_administrativeactop_modify, + name='operation_administrativeactop_modify'), url(r'operation_administrativeactop_deletion/(?P<step>.+)?$', check_rights(['change_administrativeact'])( views.operation_administrativeactop_deletion_wizard), diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 55e2b2692..0481edae3 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -426,6 +426,21 @@ operation_administrativeactop_modification_wizard = \ label=_(u"Operation: administrative act modification"), url_name='operation_administrativeactop_modification',) + +def operation_administrativeactop_modify(request, pk): + operation_administrativeactop_modification_wizard(request) + OperationEditAdministrativeActWizard.session_set_value( + request, 'selec-operation_administrativeactop_modification', + 'pk', pk, reset=True) + return redirect( + reverse( + 'operation_administrativeactop_modification', + kwargs={ + 'step': + 'administrativeact-operation_administrativeactop_modification' + })) + + operation_administrativeactop_deletion_wizard = \ AdministrativeActDeletionWizard.as_view([ ('selec-operation_administrativeactop_deletion', |