Rebase migrations

7 files changed, 4 insertions, 34 deletions

diff --git a/archaeological_context_records/migrations/0024_auto_20180530_1900.py b/archaeological_context_records/migrations/0025_auto_20180530_1900.py
index 5dac817ff..2e29a4bbd 100644
--- a/archaeological_context_records/migrations/0024_auto_20180530_1900.py
+++ b/archaeological_context_records/migrations/0025_auto_20180530_1900.py
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('ishtar_common', '0055_auto_20180530_1900'),
-        ('archaeological_context_records', '0023_auto_20180511_1232'),
+        ('archaeological_context_records', '0024_auto_20180604_1532'),
     ]
 
     operations = [
diff --git a/archaeological_context_records/migrations/0025_migrate_source_and_image.py b/archaeological_context_records/migrations/0026_migrate_source_and_image.py
index c190faac2..9f6721128 100644
--- a/archaeological_context_records/migrations/0025_migrate_source_and_image.py
+++ b/archaeological_context_records/migrations/0026_migrate_source_and_image.py
@@ -21,7 +21,7 @@ def migrate_source_and_image(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_context_records', '0024_auto_20180530_1900'),
+        ('archaeological_context_records', '0025_auto_20180530_1900'),
     ]
 
     operations = [
diff --git a/archaeological_context_records/migrations/0026_auto_20180601_1555.py b/archaeological_context_records/migrations/0027_auto_20180601_1555.py
index 44a277279..5a87eefbd 100644
--- a/archaeological_context_records/migrations/0026_auto_20180601_1555.py
+++ b/archaeological_context_records/migrations/0027_auto_20180601_1555.py
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('archaeological_context_records', '0025_migrate_source_and_image'),
+        ('archaeological_context_records', '0026_migrate_source_and_image'),
     ]
 
     operations = [
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html
deleted file mode 100644
index 725c89530..000000000
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.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 "Context record source" %}</strong> - {{item.title}} - {{item.owner}}{% endblock %}
-
-{% block window_nav %}
-{% window_nav item window_id 'show-contextrecordsource' 'record_source_modify' %}
-{% endblock %}
-
-{% block related %}
-{% trans "Related context record" as related_item_label %}
-{% field_flex related_item_label item.owner '' item.owner|link_to_window %}
-{% endblock %}
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource_pdf.html b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource_pdf.html
deleted file mode 100644
index c03b80a53..000000000
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource_pdf.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "ishtar/sheet_contextrecordsource.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_context_records/templates/ishtar/sheet_contextrecordsource_window.html b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource_window.html
deleted file mode 100644
index 21dd20758..000000000
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource_window.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% extends "ishtar/sheet_contextrecordsource.html" %}
-{% block main_head %}{%endblock%}
-{% block main_foot %}{%endblock%}
diff --git a/archaeological_context_records/urls.py b/archaeological_context_records/urls.py
index 5610150f1..c05cff87e 100644
--- a/archaeological_context_records/urls.py
+++ b/archaeological_context_records/urls.py
@@ -19,8 +19,8 @@
 
 from django.conf.urls import url
 
+from ishtar_common.utils import check_rights
 from archaeological_context_records import models
-from ishtar_common.wizards import check_rights
 from archaeological_context_records import views
 
 # be careful: each check_rights must be relevant with ishtar_menu