diff options
Diffstat (limited to 'archaeological_operations')
5 files changed, 3 insertions, 33 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource.html b/archaeological_operations/templates/ishtar/sheet_operationsource.html deleted file mode 100644 index 91cb483f0..000000000 --- a/archaeological_operations/templates/ishtar/sheet_operationsource.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "ishtar/sheet_source.html" %} -{% load i18n window_field window_header link_to_window %} - -{% block head_title %}<strong>{% trans "Operation source" %}</strong> - {{item.title}} - {{item.owner}}{% endblock %} - -{% block window_nav %} -{% window_nav item window_id 'show-operationsource' 'operation_source_modify' %} -{% endblock %} - -{% block related %} -{% trans "Related operation" as related_item_label %} -{% field_flex related_item_label item.owner '' item.owner|link_to_window %} -{% endblock %} diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html b/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html deleted file mode 100644 index 68eb7aa2d..000000000 --- a/archaeological_operations/templates/ishtar/sheet_operationsource_pdf.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "ishtar/sheet_operationsource.html" %} -{% block header %} -{% endblock %} -{% block main_head %} -{{ block.super }} -<div id="pdfheader"> -Ishtar – {{APP_NAME}} – {{item}} -</div> -{% endblock %} -{%block head_sheet%}{%endblock%} -{%block main_foot%} -</body> -</html> -{%endblock%} diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource_window.html b/archaeological_operations/templates/ishtar/sheet_operationsource_window.html deleted file mode 100644 index 8cd2c7fa1..000000000 --- a/archaeological_operations/templates/ishtar/sheet_operationsource_window.html +++ /dev/null @@ -1,3 +0,0 @@ -{% extends "ishtar/sheet_operationsource.html" %} -{% block main_head %}{%endblock%} -{% block main_foot %}{%endblock%} diff --git a/archaeological_operations/urls.py b/archaeological_operations/urls.py index 6b9a980b4..759bcc88d 100644 --- a/archaeological_operations/urls.py +++ b/archaeological_operations/urls.py @@ -19,7 +19,7 @@ from django.conf.urls import url -from ishtar_common.wizards import check_rights +from ishtar_common.utils import check_rights from archaeological_operations import views from archaeological_operations import models diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py index 97824843f..5c5a3e89b 100644 --- a/archaeological_operations/views.py +++ b/archaeological_operations/views.py @@ -49,9 +49,9 @@ from archaeological_operations.wizards import has_associated_file, \ from ishtar_common.forms import ClosingDateFormSelection, FinalForm, \ FinalDeleteForm from ishtar_common.models import get_current_profile, IshtarSiteProfile -from ishtar_common.utils import put_session_message +from ishtar_common.utils import put_session_message, check_rights_condition from ishtar_common.views import get_item, show_item, revert_item, new_item -from ishtar_common.wizards import SearchWizard, check_rights_condition +from ishtar_common.wizards import SearchWizard def autocomplete_patriarche(request): |