From 5a52b18c2cd4fcde86cefb84f90b4bd0df7be5a3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 4 Jun 2018 16:41:41 +0200 Subject: Rebase migrations --- .../migrations/0024_auto_20180530_1900.py | 67 ---------------------- .../migrations/0025_auto_20180530_1900.py | 67 ++++++++++++++++++++++ .../migrations/0025_migrate_source_and_image.py | 29 ---------- .../migrations/0026_auto_20180601_1555.py | 57 ------------------ .../migrations/0026_migrate_source_and_image.py | 29 ++++++++++ .../migrations/0027_auto_20180601_1555.py | 57 ++++++++++++++++++ .../ishtar/sheet_contextrecordsource.html | 13 ----- .../ishtar/sheet_contextrecordsource_pdf.html | 14 ----- .../ishtar/sheet_contextrecordsource_window.html | 3 - archaeological_context_records/urls.py | 2 +- 10 files changed, 154 insertions(+), 184 deletions(-) delete mode 100644 archaeological_context_records/migrations/0024_auto_20180530_1900.py create mode 100644 archaeological_context_records/migrations/0025_auto_20180530_1900.py delete mode 100644 archaeological_context_records/migrations/0025_migrate_source_and_image.py delete mode 100644 archaeological_context_records/migrations/0026_auto_20180601_1555.py create mode 100644 archaeological_context_records/migrations/0026_migrate_source_and_image.py create mode 100644 archaeological_context_records/migrations/0027_auto_20180601_1555.py delete mode 100644 archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html delete mode 100644 archaeological_context_records/templates/ishtar/sheet_contextrecordsource_pdf.html delete mode 100644 archaeological_context_records/templates/ishtar/sheet_contextrecordsource_window.html (limited to 'archaeological_context_records') diff --git a/archaeological_context_records/migrations/0024_auto_20180530_1900.py b/archaeological_context_records/migrations/0024_auto_20180530_1900.py deleted file mode 100644 index 5dac817ff..000000000 --- a/archaeological_context_records/migrations/0024_auto_20180530_1900.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-30 19:00 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0055_auto_20180530_1900'), - ('archaeological_context_records', '0023_auto_20180511_1232'), - ] - - operations = [ - migrations.AddField( - model_name='contextrecord', - name='documents', - field=models.ManyToManyField(blank=True, related_name='context_records', to='ishtar_common.Document', verbose_name='Documents'), - ), - migrations.AddField( - model_name='contextrecordsource', - name='associated_links', - field=models.TextField(blank=True, null=True, verbose_name='Symbolic links'), - ), - migrations.AddField( - model_name='contextrecordsource', - name='authors_raw', - field=models.CharField(blank=True, max_length=250, null=True, verbose_name='Authors (raw)'), - ), - migrations.AddField( - model_name='contextrecordsource', - name='index', - field=models.IntegerField(blank=True, null=True, verbose_name='Index'), - ), - migrations.AddField( - model_name='contextrecordsource', - name='licenses', - field=models.ManyToManyField(blank=True, to='ishtar_common.LicenseType', verbose_name='License'), - ), - migrations.AlterField( - model_name='contextrecordsource', - name='external_id', - field=models.TextField(blank=True, null=True, verbose_name='External ID'), - ), - migrations.AlterField( - model_name='contextrecordsource', - name='internal_reference', - field=models.TextField(blank=True, null=True, verbose_name='Internal ref.'), - ), - migrations.AlterField( - model_name='contextrecordsource', - name='reference', - field=models.TextField(blank=True, null=True, verbose_name='Ref.'), - ), - migrations.AlterField( - model_name='contextrecordsource', - name='source_type', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SourceType', verbose_name='Type'), - ), - migrations.AlterField( - model_name='contextrecordsource', - name='title', - field=models.TextField(blank=True, default=b'', verbose_name='Title'), - ), - ] diff --git a/archaeological_context_records/migrations/0025_auto_20180530_1900.py b/archaeological_context_records/migrations/0025_auto_20180530_1900.py new file mode 100644 index 000000000..2e29a4bbd --- /dev/null +++ b/archaeological_context_records/migrations/0025_auto_20180530_1900.py @@ -0,0 +1,67 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-05-30 19:00 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0055_auto_20180530_1900'), + ('archaeological_context_records', '0024_auto_20180604_1532'), + ] + + operations = [ + migrations.AddField( + model_name='contextrecord', + name='documents', + field=models.ManyToManyField(blank=True, related_name='context_records', to='ishtar_common.Document', verbose_name='Documents'), + ), + migrations.AddField( + model_name='contextrecordsource', + name='associated_links', + field=models.TextField(blank=True, null=True, verbose_name='Symbolic links'), + ), + migrations.AddField( + model_name='contextrecordsource', + name='authors_raw', + field=models.CharField(blank=True, max_length=250, null=True, verbose_name='Authors (raw)'), + ), + migrations.AddField( + model_name='contextrecordsource', + name='index', + field=models.IntegerField(blank=True, null=True, verbose_name='Index'), + ), + migrations.AddField( + model_name='contextrecordsource', + name='licenses', + field=models.ManyToManyField(blank=True, to='ishtar_common.LicenseType', verbose_name='License'), + ), + migrations.AlterField( + model_name='contextrecordsource', + name='external_id', + field=models.TextField(blank=True, null=True, verbose_name='External ID'), + ), + migrations.AlterField( + model_name='contextrecordsource', + name='internal_reference', + field=models.TextField(blank=True, null=True, verbose_name='Internal ref.'), + ), + migrations.AlterField( + model_name='contextrecordsource', + name='reference', + field=models.TextField(blank=True, null=True, verbose_name='Ref.'), + ), + migrations.AlterField( + model_name='contextrecordsource', + name='source_type', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.SourceType', verbose_name='Type'), + ), + migrations.AlterField( + model_name='contextrecordsource', + name='title', + field=models.TextField(blank=True, default=b'', verbose_name='Title'), + ), + ] diff --git a/archaeological_context_records/migrations/0025_migrate_source_and_image.py b/archaeological_context_records/migrations/0025_migrate_source_and_image.py deleted file mode 100644 index c190faac2..000000000 --- a/archaeological_context_records/migrations/0025_migrate_source_and_image.py +++ /dev/null @@ -1,29 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-30 19:22 -from __future__ import unicode_literals - -from django.db import migrations - -from ishtar_common.utils_migrations import migrate_images, migrate_sources - - -def migrate_source_and_image(apps, schema_editor): - ContextRecord = apps.get_model( - 'archaeological_context_records', 'ContextRecord') - ContextRecordImage = apps.get_model( - 'archaeological_context_records', 'ContextRecordImage') - ContextRecordSource = apps.get_model( - 'archaeological_context_records', 'ContextRecordSource') - migrate_images(apps, ContextRecord, ContextRecordImage) - migrate_sources(apps, ContextRecord, ContextRecordSource, 'context_record') - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_context_records', '0024_auto_20180530_1900'), - ] - - operations = [ - migrations.RunPython(migrate_source_and_image) - ] diff --git a/archaeological_context_records/migrations/0026_auto_20180601_1555.py b/archaeological_context_records/migrations/0026_auto_20180601_1555.py deleted file mode 100644 index 44a277279..000000000 --- a/archaeological_context_records/migrations/0026_auto_20180601_1555.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-06-01 15:55 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('archaeological_context_records', '0025_migrate_source_and_image'), - ] - - operations = [ - migrations.RemoveField( - model_name='contextrecordimage', - name='image', - ), - migrations.RemoveField( - model_name='contextrecordimage', - name='item', - ), - migrations.RemoveField( - model_name='contextrecordsource', - name='authors', - ), - migrations.RemoveField( - model_name='contextrecordsource', - name='context_record', - ), - migrations.RemoveField( - model_name='contextrecordsource', - name='format_type', - ), - migrations.RemoveField( - model_name='contextrecordsource', - name='licenses', - ), - migrations.RemoveField( - model_name='contextrecordsource', - name='source_type', - ), - migrations.RemoveField( - model_name='contextrecordsource', - name='support_type', - ), - migrations.RemoveField( - model_name='contextrecord', - name='images', - ), - migrations.DeleteModel( - name='ContextRecordImage', - ), - migrations.DeleteModel( - name='ContextRecordSource', - ), - ] diff --git a/archaeological_context_records/migrations/0026_migrate_source_and_image.py b/archaeological_context_records/migrations/0026_migrate_source_and_image.py new file mode 100644 index 000000000..9f6721128 --- /dev/null +++ b/archaeological_context_records/migrations/0026_migrate_source_and_image.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-05-30 19:22 +from __future__ import unicode_literals + +from django.db import migrations + +from ishtar_common.utils_migrations import migrate_images, migrate_sources + + +def migrate_source_and_image(apps, schema_editor): + ContextRecord = apps.get_model( + 'archaeological_context_records', 'ContextRecord') + ContextRecordImage = apps.get_model( + 'archaeological_context_records', 'ContextRecordImage') + ContextRecordSource = apps.get_model( + 'archaeological_context_records', 'ContextRecordSource') + migrate_images(apps, ContextRecord, ContextRecordImage) + migrate_sources(apps, ContextRecord, ContextRecordSource, 'context_record') + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0025_auto_20180530_1900'), + ] + + operations = [ + migrations.RunPython(migrate_source_and_image) + ] diff --git a/archaeological_context_records/migrations/0027_auto_20180601_1555.py b/archaeological_context_records/migrations/0027_auto_20180601_1555.py new file mode 100644 index 000000000..5a87eefbd --- /dev/null +++ b/archaeological_context_records/migrations/0027_auto_20180601_1555.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-06-01 15:55 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_context_records', '0026_migrate_source_and_image'), + ] + + operations = [ + migrations.RemoveField( + model_name='contextrecordimage', + name='image', + ), + migrations.RemoveField( + model_name='contextrecordimage', + name='item', + ), + migrations.RemoveField( + model_name='contextrecordsource', + name='authors', + ), + migrations.RemoveField( + model_name='contextrecordsource', + name='context_record', + ), + migrations.RemoveField( + model_name='contextrecordsource', + name='format_type', + ), + migrations.RemoveField( + model_name='contextrecordsource', + name='licenses', + ), + migrations.RemoveField( + model_name='contextrecordsource', + name='source_type', + ), + migrations.RemoveField( + model_name='contextrecordsource', + name='support_type', + ), + migrations.RemoveField( + model_name='contextrecord', + name='images', + ), + migrations.DeleteModel( + name='ContextRecordImage', + ), + migrations.DeleteModel( + name='ContextRecordSource', + ), + ] 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 %}{% trans "Context record source" %} - {{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 }} -
-Ishtar – {{APP_NAME}} – {{item}} -
-{% endblock %} -{%block head_sheet%}{%endblock%} -{%block main_foot%} - - -{%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 -- cgit v1.2.3