diff --git a/allies/__init__.py b/allies/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/allies/migrations/0001_initial.py b/allies/migrations/0001_initial.py deleted file mode 100644 index 36bfffca..00000000 --- a/allies/migrations/0001_initial.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-02-18 14:25 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.fields - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('wagtailimages', '0010_change_on_delete_behaviour'), - ] - - operations = [ - migrations.CreateModel( - name='Ally', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ally_category', models.CharField(choices=[('OH', 'Online Homework'), ('AC', 'Adaptive Courseware'), ('CT', 'Customized Tools')], max_length=2)), - ('heading', models.CharField(max_length=255)), - ('description', wagtail.fields.RichTextField()), - ('link_url', models.URLField(blank=True, help_text='Call to Action Link')), - ('link_text', models.CharField(help_text='Call to Action Text', max_length=255)), - ('logo', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), - ], - ), - ] diff --git a/allies/migrations/0002_auto_20160222_1359.py b/allies/migrations/0002_auto_20160222_1359.py deleted file mode 100644 index 65583456..00000000 --- a/allies/migrations/0002_auto_20160222_1359.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-22 19:59 -from __future__ import unicode_literals - -from django.db import migrations -import wagtail.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='ally', - old_name='description', - new_name='short_description', - ), - migrations.AddField( - model_name='ally', - name='long_description', - field=wagtail.fields.RichTextField(default=''), - preserve_default=False, - ), - ] diff --git a/allies/migrations/0003_auto_20160222_1520.py b/allies/migrations/0003_auto_20160222_1520.py deleted file mode 100644 index 9dfc2baf..00000000 --- a/allies/migrations/0003_auto_20160222_1520.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-22 21:20 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0002_auto_20160222_1359'), - ] - - operations = [ - migrations.RemoveField( - model_name='ally', - name='ally_category', - ), - migrations.AddField( - model_name='ally', - name='adaptive_course', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='ally', - name='customized_tools', - field=models.BooleanField(default=False), - ), - migrations.AddField( - model_name='ally', - name='online_course', - field=models.BooleanField(default=False), - ), - ] diff --git a/allies/migrations/0004_auto_20160224_1124.py b/allies/migrations/0004_auto_20160224_1124.py deleted file mode 100644 index 0a4ec204..00000000 --- a/allies/migrations/0004_auto_20160224_1124.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-02-24 17:24 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0003_auto_20160222_1520'), - ] - - operations = [ - migrations.RenameField( - model_name='ally', - old_name='adaptive_course', - new_name='adaptive_courseware', - ), - migrations.RenameField( - model_name='ally', - old_name='customized_tools', - new_name='customization_tools', - ), - migrations.RenameField( - model_name='ally', - old_name='online_course', - new_name='online_homework', - ), - ] diff --git a/allies/migrations/0005_auto_20160307_1432.py b/allies/migrations/0005_auto_20160307_1432.py deleted file mode 100644 index fc733fd9..00000000 --- a/allies/migrations/0005_auto_20160307_1432.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-07 20:32 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion -import modelcluster.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtailcore', '0023_alter_page_revision_on_delete_behaviour'), - ('snippets', '0001_initial'), - ('allies', '0004_auto_20160224_1124'), - ('allies', '0004_auto_20160224_1124'), - ] - - operations = [ - migrations.AlterField( - model_name='ally', - name='logo', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='logo', to='wagtailimages.Image'), - ), - migrations.CreateModel( - name='AllySubject', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ], - ), - migrations.RemoveField( - model_name='ally', - name='id', - ), - migrations.AddField( - model_name='ally', - name='page_ptr', - field=models.OneToOneField(auto_created=True, default=1, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page'), - preserve_default=False, - ), - migrations.AddField( - model_name='allysubject', - name='ally', - field=modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='ally_subjects', to='allies.Ally'), - ), - migrations.AddField( - model_name='allysubject', - name='subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='snippets.Subject'), - ), - ] diff --git a/allies/migrations/0006_ally_is_ap.py b/allies/migrations/0006_ally_is_ap.py deleted file mode 100644 index 63f350a8..00000000 --- a/allies/migrations/0006_ally_is_ap.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.1 on 2016-03-25 21:24 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0005_auto_20160307_1432'), - ] - - operations = [ - migrations.AddField( - model_name='ally', - name='is_ap', - field=models.BooleanField(default=False), - ), - ] diff --git a/allies/migrations/0007_auto_20160330_1021.py b/allies/migrations/0007_auto_20160330_1021.py deleted file mode 100644 index da93f1dd..00000000 --- a/allies/migrations/0007_auto_20160330_1021.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2016-03-30 15:21 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0006_ally_is_ap'), - ] - - operations = [ - migrations.RemoveField( - model_name='ally', - name='link_text', - ), - migrations.RemoveField( - model_name='ally', - name='link_url', - ), - ] diff --git a/allies/migrations/0008_auto_20160407_1145.py b/allies/migrations/0008_auto_20160407_1145.py deleted file mode 100644 index 4964e829..00000000 --- a/allies/migrations/0008_auto_20160407_1145.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-07 16:45 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('wagtailimages', '0012_copy_image_permissions_to_collections'), - ('allies', '0007_auto_20160330_1021'), - ] - - operations = [ - migrations.RemoveField( - model_name='ally', - name='logo', - ), - migrations.AddField( - model_name='ally', - name='logo_bw', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='logo_bw', to='wagtailimages.Image'), - ), - migrations.AddField( - model_name='ally', - name='logo_color', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='logo_color', to='wagtailimages.Image'), - ), - ] diff --git a/allies/migrations/0009_auto_20160922_1154.py b/allies/migrations/0009_auto_20160922_1154.py deleted file mode 100644 index d1c36867..00000000 --- a/allies/migrations/0009_auto_20160922_1154.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-09-22 16:54 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0008_auto_20160407_1145'), - ] - - operations = [ - migrations.AlterField( - model_name='ally', - name='logo_bw', - field=models.ForeignKey(blank=True, help_text='Image should be 340px wide, grayscale', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='logo_bw', to='wagtailimages.Image'), - ), - migrations.AlterField( - model_name='ally', - name='logo_color', - field=models.ForeignKey(blank=True, help_text='Image should be 460px wide', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='logo_color', to='wagtailimages.Image'), - ), - ] diff --git a/allies/migrations/0010_ally_do_not_display.py b/allies/migrations/0010_ally_do_not_display.py deleted file mode 100644 index 3edf492e..00000000 --- a/allies/migrations/0010_ally_do_not_display.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.1 on 2016-10-19 15:52 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0009_auto_20160922_1154'), - ] - - operations = [ - migrations.AddField( - model_name='ally', - name='do_not_display', - field=models.BooleanField(default=False), - ), - ] diff --git a/allies/migrations/0011_auto_20180301_1107.py b/allies/migrations/0011_auto_20180301_1107.py deleted file mode 100644 index 71f0b3df..00000000 --- a/allies/migrations/0011_auto_20180301_1107.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.0.2 on 2018-03-01 17:07 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('allies', '0010_ally_do_not_display'), - ] - - operations = [ - migrations.AlterField( - model_name='allysubject', - name='subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='snippets.Subject'), - ), - ] diff --git a/allies/migrations/0012_remove_ally_adaptive_courseware_and_more.py b/allies/migrations/0012_remove_ally_adaptive_courseware_and_more.py deleted file mode 100644 index 0a76859c..00000000 --- a/allies/migrations/0012_remove_ally_adaptive_courseware_and_more.py +++ /dev/null @@ -1,61 +0,0 @@ -# Generated by Django 5.1.1 on 2024-09-05 17:43 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("allies", "0011_auto_20180301_1107"), - ] - - operations = [ - migrations.RemoveField( - model_name="ally", - name="adaptive_courseware", - ), - migrations.RemoveField( - model_name="ally", - name="customization_tools", - ), - migrations.RemoveField( - model_name="ally", - name="do_not_display", - ), - migrations.RemoveField( - model_name="ally", - name="heading", - ), - migrations.RemoveField( - model_name="ally", - name="is_ap", - ), - migrations.RemoveField( - model_name="ally", - name="logo_bw", - ), - migrations.RemoveField( - model_name="ally", - name="logo_color", - ), - migrations.RemoveField( - model_name="ally", - name="long_description", - ), - migrations.RemoveField( - model_name="ally", - name="online_homework", - ), - migrations.RemoveField( - model_name="ally", - name="short_description", - ), - migrations.RemoveField( - model_name="allysubject", - name="ally", - ), - migrations.RemoveField( - model_name="allysubject", - name="subject", - ), - ] diff --git a/allies/migrations/0013_remove_ally_page_ptr_delete_allysubject_delete_ally.py b/allies/migrations/0013_remove_ally_page_ptr_delete_allysubject_delete_ally.py deleted file mode 100644 index f21822a2..00000000 --- a/allies/migrations/0013_remove_ally_page_ptr_delete_allysubject_delete_ally.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 5.1.6 on 2025-02-21 21:35 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("allies", "0012_remove_ally_adaptive_courseware_and_more"), - ] - - operations = [ - migrations.RemoveField( - model_name="ally", - name="page_ptr", - ), - migrations.DeleteModel( - name="AllySubject", - ), - migrations.DeleteModel( - name="Ally", - ), - ] diff --git a/allies/migrations/__init__.py b/allies/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/allies/models.py b/allies/models.py deleted file mode 100644 index 139597f9..00000000 --- a/allies/models.py +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/api/views.py b/api/views.py index 8875acb0..f85ecf7f 100644 --- a/api/views.py +++ b/api/views.py @@ -82,10 +82,10 @@ def mapbox(request): def errata_fields(request): - ''' + """ Return a JSON representation of fields from the errata.model.errata static options. For now this only works on resources but has the capability to be expanded in the future. - ''' + """ response = [] if request.GET.get('field', None) == 'resources': diff --git a/books/migrations/0001_initial_squashed_0100_videofacultyresources.py b/books/migrations/0001_initial_squashed_0100_videofacultyresources.py index 8ec6525a..ce45b59c 100644 --- a/books/migrations/0001_initial_squashed_0100_videofacultyresources.py +++ b/books/migrations/0001_initial_squashed_0100_videofacultyresources.py @@ -20,7 +20,6 @@ class Migration(migrations.Migration): ('wagtailcore', '0023_alter_page_revision_on_delete_behaviour'), ('snippets', '0002_communityresource'), ('snippets', '0001_initial'), - ('allies', '0001_initial'), ('wagtailimages', '0020_add-verbose-name'), ('wagtaildocs', '0007_merge'), ('snippets', '__first__'), @@ -198,19 +197,6 @@ class Migration(migrations.Migration): }, bases=('books.facultyresources', models.Model), ), - migrations.CreateModel( - name='BookAllies', - fields=[ - ('bookally_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='books.BookAlly')), - ('sort_order', models.IntegerField(blank=True, editable=False, null=True)), - ('book_ally', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, related_name='book_allies', to='books.Book')), - ], - options={ - 'ordering': ['sort_order'], - 'abstract': False, - }, - bases=('books.bookally', models.Model), - ), migrations.CreateModel( name='StudentResources', fields=[ @@ -288,9 +274,6 @@ class Migration(migrations.Migration): }, bases=('books.subjectbooks', models.Model), ), - migrations.DeleteModel( - name='BookAllies', - ), migrations.DeleteModel( name='BookAlly', ), diff --git a/openstax/settings/base.py b/openstax/settings/base.py index 78e31058..f27ff818 100644 --- a/openstax/settings/base.py +++ b/openstax/settings/base.py @@ -220,7 +220,6 @@ 'pages', 'books', 'news', - 'allies', 'snippets', 'salesforce', 'mail',