Merge pull request #99 from defencedigital/postgres-migration

Removes required flag on sub-instrument relative field and ComplyIQ from title

5 files changed, 40 insertions, 3 deletions

diff --git a/alias b/alias
index 6d91c28..6bec05a 100644
--- a/alias
+++ b/alias
@@ -1,2 +1,3 @@
 alias gitty='git pull && git checkout main && git pull && git merge postgres-migration && git checkout postgres-migration && git rebase main && git push'
 alias deletepods='oc delete pod --field-selector=status.phase==Succeeded'
+alias watchpods='watch -n1 oc get pods'
diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index d279479..1914c50 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -1,12 +1,12 @@
 {% extends "core/base.html" %}
 {% load table_extras %}
 
-{% block title %}ComplyIQ - Information Management for DefNucSyR{% endblock title %}
+{% block title %}DefNucSyR Engagement Database (DED) - Information Management for DefNucSyR{% endblock title %}
 
 {% block content %}
 
 <div class="w3-container">
-    <h2>ComplyIQ - Information Management for DefNucSyR</h2>
+    <h2>DED - Information Management for DefNucSyR</h2>
     <div class="w3-panel w3-leftbar w3-sand w3-xlarge w3-serif w3-display-container">
         <span onclick="this.parentElement.style.display='none'"
               class="w3-button w3-display-topright">&times;</span>
diff --git a/instruments/migrations/0003_alter_subinstrument_relative.py b/instruments/migrations/0003_alter_subinstrument_relative.py
new file mode 100644
index 0000000..a958b69
--- /dev/null
+++ b/instruments/migrations/0003_alter_subinstrument_relative.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.4 on 2024-06-07 10:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("instruments", "0002_subinstrument_short"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="subinstrument",
+            name="relative",
+            field=models.ManyToManyField(blank=True, null=True, to="instruments.subinstrument"),
+        ),
+    ]
diff --git a/instruments/migrations/0004_alter_subinstrument_relative.py b/instruments/migrations/0004_alter_subinstrument_relative.py
new file mode 100644
index 0000000..c2a3943
--- /dev/null
+++ b/instruments/migrations/0004_alter_subinstrument_relative.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.4 on 2024-06-07 10:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("instruments", "0003_alter_subinstrument_relative"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="subinstrument",
+            name="relative",
+            field=models.ManyToManyField(blank=True, to="instruments.subinstrument"),
+        ),
+    ]
diff --git a/instruments/models.py b/instruments/models.py
index e266fb2..9415957 100644
--- a/instruments/models.py
+++ b/instruments/models.py
@@ -39,7 +39,7 @@ class SubInstrument(Common):
     parent = models.ForeignKey(Instrument, on_delete=models.CASCADE, verbose_name="Parent Instrument")
     description = models.TextField(null=True, blank=True)
     rationale = models.TextField(null=True, blank=True)
-    relative = models.ManyToManyField("self")
+    relative = models.ManyToManyField("self", blank=True)
     short = models.CharField(max_length=10, null=True, blank=True)
 
     def effort(self):