From 5a52b18c2cd4fcde86cefb84f90b4bd0df7be5a3 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 4 Jun 2018 16:41:41 +0200
Subject: Rebase migrations

---
 archaeological_finds/models_finds.py                       |  1 +
 .../templates/ishtar/sheet_findsource.html                 | 13 -------------
 .../templates/ishtar/sheet_findsource_pdf.html             | 14 --------------
 .../templates/ishtar/sheet_findsource_window.html          |  3 ---
 .../templates/ishtar/sheet_treatmentfilesource.html        | 13 -------------
 .../templates/ishtar/sheet_treatmentfilesource_pdf.html    | 14 --------------
 .../templates/ishtar/sheet_treatmentfilesource_window.html |  3 ---
 .../templates/ishtar/sheet_treatmentsource.html            | 13 -------------
 .../templates/ishtar/sheet_treatmentsource_pdf.html        | 14 --------------
 .../templates/ishtar/sheet_treatmentsource_window.html     |  3 ---
 archaeological_finds/urls.py                               |  2 +-
 11 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_findsource.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_findsource_pdf.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_findsource_window.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_treatmentsource.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html
 delete mode 100644 archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html

(limited to 'archaeological_finds')

diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 72e4d8607..a217eb079 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -528,6 +528,7 @@ class BaseFind(BulkUpdatedItem, BaseHistorizedItem, OwnPerms):
             c.execute(sql, args)
         Find.cached_label_bulk_update(**kwargs)
 
+
 post_save.connect(post_save_point, sender=BaseFind)
 
 
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource.html b/archaeological_finds/templates/ishtar/sheet_findsource.html
deleted file mode 100644
index a3825173f..000000000
--- a/archaeological_finds/templates/ishtar/sheet_findsource.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 "Find source" %}</strong> - {{item.title}} - {{item.owner}}{% endblock %}
-
-{% block window_nav %}
-{% window_nav item window_id 'show-findsource' 'find_source_modify' %}
-{% endblock %}
-
-{% block related %}
-{% trans "Related find" as related_item_label %}
-{% field_flex related_item_label item.owner '' item.owner|link_to_window %}
-{% endblock %}
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource_pdf.html b/archaeological_finds/templates/ishtar/sheet_findsource_pdf.html
deleted file mode 100644
index 7ca3bd3c1..000000000
--- a/archaeological_finds/templates/ishtar/sheet_findsource_pdf.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "ishtar/sheet_findsource.html" %}
-{% block header %}
-{% endblock %}
-{% block main_head %}
-{{ block.super }}
-<div id="pdfheader">
-Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
-</div>
-{% endblock %}
-{%block head_sheet%}{%endblock%}
-{%block main_foot%}
-</body>
-</html>
-{%endblock%}
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource_window.html b/archaeological_finds/templates/ishtar/sheet_findsource_window.html
deleted file mode 100644
index b2a2974bf..000000000
--- a/archaeological_finds/templates/ishtar/sheet_findsource_window.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "ishtar/sheet_findsource.html" %}
-{% block main_head %}{%endblock%}
-{% block main_foot %}{%endblock%}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
deleted file mode 100644
index 17cc14b5b..000000000
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "ishtar/sheet_source.html" %}
-{% load i18n window_field window_header link_to_window %}
-
-{% block head_title %}{% trans "Treatment request source" %}{% endblock %}
-
-{% block window_nav %}
-{% window_nav item window_id 'show-treatmentfilesource' 'treatmentfile_source_modify' %}
-{% endblock %}
-
-{% block related %}
-{% trans "Related treatment request" as related_item_label %}
-{% field related_item_label item.owner '' item.owner|link_to_window %}
-{% endblock %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html
deleted file mode 100644
index 2ef4d63b5..000000000
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_pdf.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "ishtar/sheet_treatmentfilesource.html" %}
-{% block header %}
-{% endblock %}
-{% block main_head %}
-{{ block.super }}
-<div id="pdfheader">
-Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
-</div>
-{% endblock %}
-{%block head_sheet%}{%endblock%}
-{%block main_foot%}
-</body>
-</html>
-{%endblock%}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html
deleted file mode 100644
index 4ebf9c02a..000000000
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource_window.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "ishtar/sheet_treatmentfilesource.html" %}
-{% block main_head %}{%endblock%}
-{% block main_foot %}{%endblock%}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html
deleted file mode 100644
index 70e69c704..000000000
--- a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends "ishtar/sheet_source.html" %}
-{% load i18n window_field window_header link_to_window %}
-
-{% block head_title %}{% trans "Treatment source" %}{% endblock %}
-
-{% block window_nav %}
-{% window_nav item window_id 'show-treatmentsource' 'treatment_source_modify' %}
-{% endblock %}
-
-{% block related %}
-{% trans "Related treatment" as related_item_label %}
-{% field related_item_label item.owner '' item.owner|link_to_window %}
-{% endblock %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html
deleted file mode 100644
index 4b7218a14..000000000
--- a/archaeological_finds/templates/ishtar/sheet_treatmentsource_pdf.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "ishtar/sheet_treatmentsource.html" %}
-{% block header %}
-{% endblock %}
-{% block main_head %}
-{{ block.super }}
-<div id="pdfheader">
-Ishtar &ndash; {{APP_NAME}} &ndash; {{item}}
-</div>
-{% endblock %}
-{%block head_sheet%}{%endblock%}
-{%block main_foot%}
-</body>
-</html>
-{%endblock%}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html
deleted file mode 100644
index 2af5ff708..000000000
--- a/archaeological_finds/templates/ishtar/sheet_treatmentsource_window.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "ishtar/sheet_treatmentsource.html" %}
-{% block main_head %}{%endblock%}
-{% block main_foot %}{%endblock%}
diff --git a/archaeological_finds/urls.py b/archaeological_finds/urls.py
index bd466a1af..ca7f10296 100644
--- a/archaeological_finds/urls.py
+++ b/archaeological_finds/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_finds import views
 from archaeological_operations.views import administrativeactfile_document
-- 
cgit v1.2.3