Skip to content

Commit

Permalink
Build issue solution attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
sab-LC committed Oct 17, 2024
1 parent 7a219c0 commit 8000e52
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='institution',
name='show_sp_connection',
field=models.BooleanField(default=True),
field=models.BooleanField(default=True, null=True),
),
migrations.AddConstraint(
model_name='institution',
constraint=models.UniqueConstraint(django.db.models.functions.text.Lower('institution_name'), name='institution_name', violation_error_message='This institution is already on the Hub.'),
constraint=models.UniqueConstraint(
django.db.models.functions.text.Lower('institution_name'),
name='institution_name_unique'
),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 5.0.9 on 2024-10-17 14:57

import django.core.validators
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('institutions', '0039_alter_institution_sp_privacy'),
]

operations = [
migrations.AlterField(
model_name='institution',
name='description',
field=models.TextField(null=True, validators=[django.core.validators.MaxLengthValidator(200)]),
),
migrations.AlterField(
model_name='institution',
name='sp_privacy',
field=models.CharField(choices=[('public', 'Public/Contributor'), ('all', 'All')], default='all', max_length=20, null=True),
),
]
8 changes: 6 additions & 2 deletions institutions/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from django.core.validators import MaxLengthValidator
import uuid
import os
from django.core.exceptions import ValidationError

class SubscribedManager(models.Manager):
def get_queryset(self):
Expand Down Expand Up @@ -52,6 +53,10 @@ class Institution(models.Model):
objects = models.Manager()
subscribed = SubscribedManager()

def clean(self):
if Institution.objects.filter(institution_name__iexact=self.institution_name).exclude(pk=self.pk).exists():
raise ValidationError("This institution is already on the Hub.")

def get_location(self):
components = [self.city_town, self.state_province_region, self.country]
location = ', '.join(filter(None, components)) or None
Expand Down Expand Up @@ -99,8 +104,7 @@ class Meta:
constraints = [
models.UniqueConstraint(
Lower('institution_name'),
name='institution_name',
violation_error_message='This institution is already on the Hub.'
name='institution_name_unique'
),
]

0 comments on commit 8000e52

Please sign in to comment.