Merge pull request #391 from ImagingDataCommons/idc-prod-sp

v19

Author: s-paquette

idc_collections/migrations/0012_auto_20240820_1650.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.23 on 2024-08-20 23:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('idc_collections', '0011_auto_20231116_1627'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='attribute_tooltips',
+            name='tooltip',
+            field=models.TextField(),
+        ),
+        migrations.AlterField(
+            model_name='collection',
+            name='collections',
+            field=models.TextField(null=True),
+        ),
+    ]

idc_collections/models.py

@@ -68,7 +68,7 @@ def get_public_programs(cls):
         return Program.objects.filter(active=True,is_public=True,owner=User.objects.get(is_active=True,username="idc",is_superuser=True,is_staff=True))
 
     def __str__(self):
-        return "{} ({}), {}".format(self.short_name, self.name, "Public" if self.is_public else "Private (owner: {})".format(self.owner.email))
+        return "{} ({}), {}".format(self.short_name, self.display_name, "Public" if self.is_public else "Private (owner: {})".format(self.owner.email))
 
 
 class Project(models.Model):
@@ -328,7 +328,7 @@ class Collection(models.Model):
     objects = CollectionManager()
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
     access = models.CharField(max_length=16, null=False, blank=False, default="Public")
-    collections = models.CharField(max_length=255, null=True, blank=False)
+    collections = models.TextField(null=True, blank=False)
     data_versions = models.ManyToManyField(DataVersion)
     # We make this many to many in case a collection is part of one program, though it may not be
     program = models.ForeignKey(Program, on_delete=models.CASCADE, null=True)
@@ -794,7 +794,7 @@ class Attribute_Tooltips(models.Model):
     attribute = models.ForeignKey(Attribute, null=False, blank=False, on_delete=models.CASCADE)
     # The value of the attribute linked to this tooltip
     tooltip_id = models.CharField(max_length=256, null=False, blank=False)
-    tooltip = models.CharField(max_length=4096, null=False, blank=False)
+    tooltip = models.TextField(null=False, blank=False)
     objects = Attribute_TooltipsManager()
 
     class Meta(object):