From af605fb6143bb6f644ccc55414dd4d0d20434070 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Tue, 22 Dec 2020 11:03:52 +0100
Subject: [PATCH] remove irods dependency
---
.../migrations/0003_auto_20201218_1500.py | 36 +++++++++++++++++++
atdb/taskdatabase/services/algorithms.py | 2 --
.../templates/taskdatabase/index.html | 2 +-
3 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 atdb/taskdatabase/migrations/0003_auto_20201218_1500.py
diff --git a/atdb/taskdatabase/migrations/0003_auto_20201218_1500.py b/atdb/taskdatabase/migrations/0003_auto_20201218_1500.py
new file mode 100644
index 00000000..10f921a2
--- /dev/null
+++ b/atdb/taskdatabase/migrations/0003_auto_20201218_1500.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.1.4 on 2020-12-18 14:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('taskdatabase', '0002_remove_taskobject_irods_collection'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='dataproduct',
+ name='quality',
+ ),
+ migrations.RemoveField(
+ model_name='observation',
+ name='quality',
+ ),
+ migrations.AddField(
+ model_name='taskobject',
+ name='quality',
+ field=models.CharField(default='unknown', max_length=30),
+ ),
+ migrations.AlterField(
+ model_name='taskobject',
+ name='data_location',
+ field=models.CharField(blank=True, default='unknown', max_length=255, null=True),
+ ),
+ migrations.AlterField(
+ model_name='taskobject',
+ name='node',
+ field=models.CharField(blank=True, max_length=10, null=True),
+ ),
+ ]
diff --git a/atdb/taskdatabase/services/algorithms.py b/atdb/taskdatabase/services/algorithms.py
index 4806f47b..ba27357b 100644
--- a/atdb/taskdatabase/services/algorithms.py
+++ b/atdb/taskdatabase/services/algorithms.py
@@ -128,7 +128,6 @@ def add_dataproducts(taskID, dataproducts):
# get the common fields from the observation based on the given taskid
parent = Observation.objects.get(taskID=taskID)
- irods_collection = parent.irods_collection
parent_data_location = parent.data_location
for dp in dataproducts:
@@ -145,7 +144,6 @@ def add_dataproducts(taskID, dataproducts):
task_type='dataproduct',
new_status=new_status,
parent=parent,
- irods_collection=irods_collection,
size=size
)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index 1b62dd91..c56cc956 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -46,7 +46,7 @@
</div>
{% include 'taskdatabase/pagination.html' %}
</div>
- <p class="footer"> Version 2.0.0 (18 dec 2020 - 15:00
+ <p class="footer"> Version 1.0.0 (22 dec 2020 - 11:00)
<script type="text/javascript">
(function(seconds) {
var refresh,
--
GitLab