diff --git a/ccdb/collections_ccdb/migrations/0001_initial.py b/ccdb/collections_ccdb/migrations/0001_initial.py index fab79c1..9430510 100644 --- a/ccdb/collections_ccdb/migrations/0001_initial.py +++ b/ccdb/collections_ccdb/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -16,7 +15,6 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, primary_key=True, auto_created=True)), ('name', models.CharField(max_length=200)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -43,7 +41,6 @@ class Migration(migrations.Migration): ('code', models.CharField(blank=True, max_length=10)), ('collection_method_class', models.CharField(blank=True, max_length=50)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -68,7 +65,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ('code', models.CharField(blank=True, max_length=10)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -89,7 +85,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=200)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], diff --git a/ccdb/collections_ccdb/models.py b/ccdb/collections_ccdb/models.py index d1bbef9..eaefd6d 100644 --- a/ccdb/collections_ccdb/models.py +++ b/ccdb/collections_ccdb/models.py @@ -1,13 +1,10 @@ from django.db import models -from autoslug import AutoSlugField - class CollectionType(models.Model): name = models.CharField(max_length=100) code = models.CharField(max_length=10, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -22,7 +19,6 @@ class CollectionMethod(models.Model): code = models.CharField(max_length=10, blank=True) collection_method_class = models.CharField(max_length=50, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -36,7 +32,6 @@ class Flaw(models.Model): name = models.CharField(max_length=200) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -48,7 +43,6 @@ class Flaw(models.Model): class ADFGPermit(models.Model): name = models.CharField(max_length=200) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name diff --git a/ccdb/experiments/migrations/0001_initial.py b/ccdb/experiments/migrations/0001_initial.py index 0fc078c..5ce31a2 100644 --- a/ccdb/experiments/migrations/0001_initial.py +++ b/ccdb/experiments/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -19,7 +18,6 @@ class Migration(migrations.Migration): ('code', models.CharField(blank=True, max_length=10)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -32,7 +30,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=200)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -65,7 +62,6 @@ class Migration(migrations.Migration): ('placement', models.CharField(blank=True, max_length=25)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ('experiment', models.ForeignKey(to='experiments.Experiment', null=True, blank=True)), ], options={ diff --git a/ccdb/experiments/models.py b/ccdb/experiments/models.py index 75f58cb..4cadce8 100644 --- a/ccdb/experiments/models.py +++ b/ccdb/experiments/models.py @@ -1,13 +1,10 @@ from django.db import models -from autoslug import AutoSlugField - class Flaw(models.Model): name = models.CharField(max_length=200) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -22,7 +19,6 @@ class Experiment(models.Model): description = models.CharField(max_length=255, blank=True) flaw = models.ForeignKey(Flaw, blank=True, null=True, related_name='experiments') sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') collections = models.ManyToManyField('collections_ccdb.Collection') def __str__(self): @@ -50,7 +46,6 @@ class TreatmentType(models.Model): placement = models.CharField(max_length=25, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') display_name = models.CharField(max_length=255, editable=False) def save(self, *args, **kwargs): diff --git a/ccdb/locations/migrations/0001_initial.py b/ccdb/locations/migrations/0001_initial.py index e77cdf9..5976929 100644 --- a/ccdb/locations/migrations/0001_initial.py +++ b/ccdb/locations/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -16,7 +15,6 @@ class Migration(migrations.Migration): ('municipal_location_type', models.CharField(blank=True, max_length=50)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ], options={ 'ordering': ['sort_order'], @@ -29,7 +27,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ('code', models.CharField(blank=True, max_length=10)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ], options={ 'ordering': ['sort_order'], @@ -43,7 +40,6 @@ class Migration(migrations.Migration): ('code', models.CharField(blank=True, max_length=10)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ('region', models.ForeignKey(to='locations.Region', null=True, blank=True)), ], options={ @@ -78,7 +74,6 @@ class Migration(migrations.Migration): ('collecting_location', models.BooleanField(default=False)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ('municipal_location', models.ForeignKey(to='locations.MunicipalLocation', null=True, blank=True)), ('site', models.ForeignKey(to='locations.Site', null=True, blank=True)), ], diff --git a/ccdb/locations/models.py b/ccdb/locations/models.py index c141d04..977b801 100644 --- a/ccdb/locations/models.py +++ b/ccdb/locations/models.py @@ -1,13 +1,10 @@ from django.db import models -from autoslug import AutoSlugField - class Region(models.Model): name = models.CharField(max_length=100) code = models.CharField(max_length=10, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -23,7 +20,6 @@ class Site(models.Model): code = models.CharField(max_length=10, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -38,7 +34,6 @@ class MunicipalLocation(models.Model): municipal_location_type = models.CharField(max_length=50, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -58,7 +53,6 @@ class StudyLocation(models.Model): collecting_location = models.BooleanField(default=False) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.code diff --git a/ccdb/misc/migrations/0001_initial.py b/ccdb/misc/migrations/0001_initial.py index 760ddc3..6c59cde 100644 --- a/ccdb/misc/migrations/0001_initial.py +++ b/ccdb/misc/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -15,7 +14,6 @@ class Migration(migrations.Migration): ('code', models.CharField(max_length=10, blank=True)), ('color_number', models.FloatField(blank=True, null=True)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ], options={ 'ordering': ['sort_order'], @@ -30,7 +28,6 @@ class Migration(migrations.Migration): ('application', models.CharField(max_length=50, blank=True)), ('volume', models.FloatField(blank=True, null=True)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ('color', models.ForeignKey(blank=True, to='misc.Color', null=True)), ], options={ @@ -46,7 +43,6 @@ class Migration(migrations.Migration): ('material_class', models.CharField(max_length=50, blank=True)), ('description', models.CharField(max_length=255, blank=True)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ], options={ 'ordering': ['sort_order'], @@ -61,7 +57,6 @@ class Migration(migrations.Migration): ('measurement_type_class', models.CharField(max_length=50, blank=True)), ('description', models.CharField(max_length=255, blank=True)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ], options={ 'ordering': ['sort_order'], @@ -76,7 +71,6 @@ class Migration(migrations.Migration): ('unit_class', models.CharField(max_length=50, blank=True)), ('description', models.CharField(max_length=255, blank=True)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name')), ], options={ 'ordering': ['sort_order'], diff --git a/ccdb/misc/models.py b/ccdb/misc/models.py index 69d0e46..ef002ef 100644 --- a/ccdb/misc/models.py +++ b/ccdb/misc/models.py @@ -1,7 +1,5 @@ from django.db import models -from autoslug import AutoSlugField - class MeasurementUnit(models.Model): name = models.CharField(max_length=100) @@ -9,7 +7,6 @@ class MeasurementUnit(models.Model): unit_class = models.CharField(max_length=50, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.code @@ -28,7 +25,6 @@ class MeasurementType(models.Model): null=True, related_name='measurement_types') sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -43,7 +39,6 @@ class Material(models.Model): material_class = models.CharField(max_length=50, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -58,7 +53,6 @@ class Color(models.Model): code = models.CharField(max_length=10, blank=True) color_number = models.FloatField(blank=True, null=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -80,7 +74,6 @@ class Container(models.Model): measurement_unit = models.ForeignKey(MeasurementUnit, blank=True, null=True, related_name='containers') sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name diff --git a/ccdb/processing/migrations/0001_initial.py b/ccdb/processing/migrations/0001_initial.py index 9c1c53c..f2b4b18 100644 --- a/ccdb/processing/migrations/0001_initial.py +++ b/ccdb/processing/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -15,7 +14,6 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=200)), ('description', models.CharField(max_length=255, blank=True)), ('sort_order', models.IntegerField(null=True, blank=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -43,7 +41,6 @@ class Migration(migrations.Migration): ('code', models.CharField(max_length=10, blank=True)), ('description', models.CharField(max_length=255, blank=True)), ('sort_order', models.IntegerField(null=True, blank=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], @@ -57,7 +54,6 @@ class Migration(migrations.Migration): ('code', models.CharField(max_length=10, blank=True)), ('reagent_class', models.CharField(max_length=50, blank=True)), ('sort_order', models.IntegerField(null=True, blank=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], diff --git a/ccdb/processing/models.py b/ccdb/processing/models.py index fc01fa6..c988ed9 100644 --- a/ccdb/processing/models.py +++ b/ccdb/processing/models.py @@ -1,14 +1,11 @@ from django.db import models -from autoslug import AutoSlugField - class ProcessType(models.Model): name = models.CharField(max_length=100) code = models.CharField(max_length=10, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -23,7 +20,6 @@ class Reagent(models.Model): code = models.CharField(max_length=10, blank=True) reagent_class = models.CharField(max_length=50, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name @@ -37,7 +33,6 @@ class Flaw(models.Model): name = models.CharField(max_length=200) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name diff --git a/ccdb/projects/migrations/0001_initial.py b/ccdb/projects/migrations/0001_initial.py index 9d01e59..22da795 100644 --- a/ccdb/projects/migrations/0001_initial.py +++ b/ccdb/projects/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -16,7 +15,6 @@ class Migration(migrations.Migration): ('iacuc_number', models.CharField(blank=True, max_length=25)), ('description', models.CharField(blank=True, max_length=255)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='name', editable=False)), ], options={ 'ordering': ['sort_order'], diff --git a/ccdb/projects/models.py b/ccdb/projects/models.py index 24212ce..1bfcdf3 100644 --- a/ccdb/projects/models.py +++ b/ccdb/projects/models.py @@ -1,7 +1,5 @@ from django.db import models -from autoslug import AutoSlugField - class Project(models.Model): name = models.CharField(max_length=100) @@ -9,7 +7,6 @@ class Project(models.Model): iacuc_number = models.CharField(max_length=25, blank=True) description = models.CharField(max_length=255, blank=True) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='name') def __str__(self): return self.name diff --git a/ccdb/species/migrations/0001_initial.py b/ccdb/species/migrations/0001_initial.py index 14104b4..0c77384 100644 --- a/ccdb/species/migrations/0001_initial.py +++ b/ccdb/species/migrations/0001_initial.py @@ -1,5 +1,4 @@ from django.db import migrations, models -import autoslug.fields class Migration(migrations.Migration): @@ -17,7 +16,6 @@ class Migration(migrations.Migration): ('species', models.CharField(max_length=50, blank=True)), ('parasite', models.BooleanField(default=False)), ('sort_order', models.IntegerField(blank=True, null=True)), - ('slug', autoslug.fields.AutoSlugField(populate_from='common_name', editable=False)), ], options={ 'ordering': ['sort_order'], diff --git a/ccdb/species/models.py b/ccdb/species/models.py index 92504b9..9954791 100644 --- a/ccdb/species/models.py +++ b/ccdb/species/models.py @@ -1,7 +1,5 @@ from django.db import models -from autoslug import AutoSlugField - class Species(models.Model): common_name = models.CharField(max_length=100) @@ -9,7 +7,6 @@ class Species(models.Model): species = models.CharField(max_length=50, blank=True) parasite = models.BooleanField(default=False) sort_order = models.IntegerField(blank=True, null=True) - slug = AutoSlugField(populate_from='common_name') def __str__(self): return self.common_name diff --git a/config/settings/base.py b/config/settings/base.py index ba9d175..6ae4c22 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -214,9 +214,6 @@ AUTH_USER_MODEL = 'users.User' LOGIN_REDIRECT_URL = 'users:redirect' LOGIN_URL = 'account_login' -# SLUGLIFIER -AUTOSLUG_SLUGIFY_FUNCTION = 'slugify.slugify' - # Location of root django.contrib.admin URL, use {% url 'admin:index' %} ADMIN_URL = r'^admin/' diff --git a/requirements/base.txt b/requirements/base.txt index 067b10a..89f3230 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -18,10 +18,6 @@ psycopg2==2.6.1 # User Registration django-allauth==0.25.2 -# Unicode slugification -unicode-slugify==0.1.3 -django-autoslug==1.9.3 - # Time zones support pytz==2016.4