diff --git a/apps/hautaka/migrations/__init__.py b/apps/hautaka/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/apps/huri/migrations/0001_initial.py b/apps/huri/migrations/0001_initial.py index 3bb0ded..bb0b95d 100644 --- a/apps/huri/migrations/0001_initial.py +++ b/apps/huri/migrations/0001_initial.py @@ -1,6 +1,5 @@ -# Generated by Django 5.0.7 on 2024-08-06 15:02 +# Generated by Django 5.1 on 2024-08-28 13:33 -import apps.huri.models import awa.models import colorfield.fields import django.db.models.deletion @@ -83,7 +82,8 @@ class Migration(migrations.Migration): models.FilePathField( match=".*\\.(png)$", max_length=20, - path=apps.huri.models.ICON_TYPE_PATH, + path="/home/matt/hack/awa/apps/huri/resources/themes/default", + recursive=True, ), ), ( @@ -95,11 +95,12 @@ class Migration(migrations.Migration): ), ), ], - ), - migrations.AddConstraint( - model_name="themeicon", - constraint=models.UniqueConstraint( - fields=("theme", "icon_type"), name="unique_icon_type_per_theme" - ), + options={ + "constraints": [ + models.UniqueConstraint( + fields=("theme", "icon_type"), name="unique_icon_type_per_theme" + ) + ], + }, ), ] diff --git a/apps/huri/migrations/0002_alter_themeicon_icon_type.py b/apps/huri/migrations/0002_alter_themeicon_icon_type.py deleted file mode 100644 index df2ed04..0000000 --- a/apps/huri/migrations/0002_alter_themeicon_icon_type.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 5.1 on 2024-08-10 11:54 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("huri", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="themeicon", - name="icon_type", - field=models.FilePathField( - match=".*\\.(png)$", - max_length=20, - path="/home/matt/hack/awa/apps/huri/resources/themes/default", - recursive=True, - ), - ), - ] diff --git a/apps/mana/migrations/0001_initial.py b/apps/mana/migrations/0001_initial.py index b045cbd..135d8dd 100644 --- a/apps/mana/migrations/0001_initial.py +++ b/apps/mana/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-19 11:48 +# Generated by Django 5.1 on 2024-08-28 13:33 import django.contrib.auth.validators import django.db.models.deletion @@ -108,7 +108,7 @@ class Migration(migrations.Migration): django_currentuser.db.models.fields.CurrentUserField( default=django_currentuser.middleware.get_current_authenticated_user, null=True, - on_delete=django.db.models.deletion.CASCADE, + on_delete=django.db.models.deletion.SET_DEFAULT, related_name="%(app_label)s_%(class)s_created", to=settings.AUTH_USER_MODEL, ), @@ -129,7 +129,7 @@ class Migration(migrations.Migration): django_currentuser.db.models.fields.CurrentUserField( default=django_currentuser.middleware.get_current_authenticated_user, null=True, - on_delete=django.db.models.deletion.CASCADE, + on_delete=django.db.models.deletion.SET_DEFAULT, on_update=True, related_name="%(app_label)s_%(class)s_modified", to=settings.AUTH_USER_MODEL, diff --git a/apps/mana/migrations/0002_alter_manauser_created_by_alter_manauser_modified_by.py b/apps/mana/migrations/0002_alter_manauser_created_by_alter_manauser_modified_by.py deleted file mode 100644 index e1423f4..0000000 --- a/apps/mana/migrations/0002_alter_manauser_created_by_alter_manauser_modified_by.py +++ /dev/null @@ -1,40 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-04 16:32 - -import django.db.models.deletion -import django_currentuser.db.models.fields -import django_currentuser.middleware -from django.conf import settings -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("mana", "0001_initial"), - ] - - operations = [ - migrations.AlterField( - model_name="manauser", - name="created_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - related_name="%(app_label)s_%(class)s_created", - to=settings.AUTH_USER_MODEL, - ), - ), - migrations.AlterField( - model_name="manauser", - name="modified_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - on_update=True, - related_name="%(app_label)s_%(class)s_modified", - to=settings.AUTH_USER_MODEL, - ), - ), - ] diff --git a/apps/rakau/migrations/0001_initial.py b/apps/rakau/migrations/0001_initial.py index 69389b5..c30a4d0 100644 --- a/apps/rakau/migrations/0001_initial.py +++ b/apps/rakau/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-19 11:48 +# Generated by Django 5.1 on 2024-08-28 13:33 import django.db.models.deletion from django.db import migrations, models @@ -39,7 +39,7 @@ class Migration(migrations.Migration): parent_link=True, primary_key=True, serialize=False, - to="ara.context", + to="rakau.context", ), ), ("path", models.SlugField()), @@ -49,11 +49,11 @@ class Migration(migrations.Migration): null=True, on_delete=django.db.models.deletion.CASCADE, related_name="children", - to="ara.context", + to="rakau.context", ), ), ], - bases=("ara.context",), + bases=("rakau.context",), ), migrations.CreateModel( name="ContextRoot", @@ -66,13 +66,13 @@ class Migration(migrations.Migration): parent_link=True, primary_key=True, serialize=False, - to="ara.context", + to="rakau.context", ), ), ("project_name", models.CharField(max_length=32, unique=True)), ("default_path", models.CharField(default="index", max_length=128)), ], - bases=("ara.context",), + bases=("rakau.context",), ), migrations.CreateModel( name="ContextFile", @@ -85,12 +85,12 @@ class Migration(migrations.Migration): parent_link=True, primary_key=True, serialize=False, - to="ara.contextpath", + to="rakau.contextpath", ), ), ("file", models.FileField(upload_to="")), ], - bases=("ara.contextpath",), + bases=("rakau.contextpath",), ), migrations.CreateModel( name="SiteContext", @@ -114,7 +114,7 @@ class Migration(migrations.Migration): "context_root", models.ForeignKey( on_delete=django.db.models.deletion.CASCADE, - to="ara.contextroot", + to="rakau.contextroot", ), ), ], @@ -122,7 +122,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="contextroot", name="sites", - field=models.ManyToManyField(through="ara.SiteContext", to="sites.site"), + field=models.ManyToManyField(through="rakau.SiteContext", to="sites.site"), ), migrations.CreateModel( name="ContentNode", @@ -135,7 +135,7 @@ class Migration(migrations.Migration): parent_link=True, primary_key=True, serialize=False, - to="ara.contextpath", + to="rakau.contextpath", ), ), ("object_id", models.PositiveIntegerField(null=True)), @@ -148,12 +148,12 @@ class Migration(migrations.Migration): ), ), ], - bases=("ara.contextpath",), + bases=("rakau.contextpath",), ), migrations.AddIndex( model_name="contextpath", index=models.Index( - fields=["parent", "path"], name="ara_context_parent__c56010_idx" + fields=["parent", "path"], name="rakau_conte_parent__cff211_idx" ), ), migrations.AddConstraint( @@ -163,7 +163,7 @@ class Migration(migrations.Migration): ("parent__isnull", True), ("path__isnull", True), _negated=True ), fields=("path", "parent"), - name="ara_contextpath_unique_context_path", + name="rakau_contextpath_unique_context_path", nulls_distinct=True, ), ), @@ -171,7 +171,7 @@ class Migration(migrations.Migration): model_name="contentnode", index=models.Index( fields=["content_type", "object_id"], - name="ara_content_content_0516a9_idx", + name="rakau_conte_content_fd14db_idx", ), ), ] diff --git a/apps/rakau/migrations/0002_remove_contextpath_ara_contextpath_unique_context_path_and_more.py b/apps/rakau/migrations/0002_remove_contextpath_ara_contextpath_unique_context_path_and_more.py deleted file mode 100644 index 58f3603..0000000 --- a/apps/rakau/migrations/0002_remove_contextpath_ara_contextpath_unique_context_path_and_more.py +++ /dev/null @@ -1,110 +0,0 @@ -# Generated by Django 5.1 on 2024-08-25 12:52 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("rakau", "0001_initial"), - ("sites", "0002_alter_domain_unique"), - ] - - operations = [ - migrations.RemoveConstraint( - model_name="contextpath", - name="ara_contextpath_unique_context_path", - ), - migrations.RenameIndex( - model_name="contentnode", - new_name="rakau_conte_content_fd14db_idx", - old_name="ara_content_content_0516a9_idx", - ), - migrations.RenameIndex( - model_name="contextpath", - new_name="rakau_conte_parent__cff211_idx", - old_name="ara_context_parent__c56010_idx", - ), - migrations.AlterField( - model_name="contentnode", - name="contextpath_ptr", - field=models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="rakau.contextpath", - ), - ), - migrations.AlterField( - model_name="contextfile", - name="contextpath_ptr", - field=models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="rakau.contextpath", - ), - ), - migrations.AlterField( - model_name="contextpath", - name="context_ptr", - field=models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="rakau.context", - ), - ), - migrations.AlterField( - model_name="contextpath", - name="parent", - field=models.ForeignKey( - null=True, - on_delete=django.db.models.deletion.CASCADE, - related_name="children", - to="rakau.context", - ), - ), - migrations.AlterField( - model_name="contextroot", - name="context_ptr", - field=models.OneToOneField( - auto_created=True, - on_delete=django.db.models.deletion.CASCADE, - parent_link=True, - primary_key=True, - serialize=False, - to="rakau.context", - ), - ), - migrations.AlterField( - model_name="contextroot", - name="sites", - field=models.ManyToManyField(through="rakau.SiteContext", to="sites.site"), - ), - migrations.AlterField( - model_name="sitecontext", - name="context_root", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, to="rakau.contextroot" - ), - ), - migrations.AddConstraint( - model_name="contextpath", - constraint=models.UniqueConstraint( - condition=models.Q( - ("parent__isnull", True), ("path__isnull", True), _negated=True - ), - fields=("path", "parent"), - name="rakau_contextpath_unique_context_path", - nulls_distinct=True, - ), - ), - ] diff --git a/apps/tuhi/migrations/0001_initial.py b/apps/tuhi/migrations/0001_initial.py index 6179a54..6916b38 100644 --- a/apps/tuhi/migrations/0001_initial.py +++ b/apps/tuhi/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.6 on 2024-07-19 11:48 +# Generated by Django 5.1 on 2024-08-28 13:33 import django.db.models.deletion import django_currentuser.db.models.fields @@ -38,7 +38,7 @@ class Migration(migrations.Migration): django_currentuser.db.models.fields.CurrentUserField( default=django_currentuser.middleware.get_current_authenticated_user, null=True, - on_delete=django.db.models.deletion.CASCADE, + on_delete=django.db.models.deletion.SET_DEFAULT, related_name="%(app_label)s_%(class)s_created", to=settings.AUTH_USER_MODEL, ), @@ -48,7 +48,7 @@ class Migration(migrations.Migration): django_currentuser.db.models.fields.CurrentUserField( default=django_currentuser.middleware.get_current_authenticated_user, null=True, - on_delete=django.db.models.deletion.CASCADE, + on_delete=django.db.models.deletion.SET_DEFAULT, on_update=True, related_name="%(app_label)s_%(class)s_modified", to=settings.AUTH_USER_MODEL, @@ -73,11 +73,61 @@ class Migration(migrations.Migration): to="tuhi.folder", ), ), - ("content", django_quill.fields.QuillField()), + ("draft", models.BooleanField(default=True)), ], options={ "abstract": False, }, bases=("tuhi.folder",), ), + migrations.CreateModel( + name="PageSection", + fields=[ + ( + "id", + models.BigAutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("created", models.DateTimeField(auto_now_add=True)), + ("modified", models.DateTimeField(auto_now=True)), + ("title", models.CharField(blank=True, default="", max_length=255)), + ("content", django_quill.fields.QuillField()), + ( + "created_by", + django_currentuser.db.models.fields.CurrentUserField( + default=django_currentuser.middleware.get_current_authenticated_user, + null=True, + on_delete=django.db.models.deletion.SET_DEFAULT, + related_name="%(app_label)s_%(class)s_created", + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "modified_by", + django_currentuser.db.models.fields.CurrentUserField( + default=django_currentuser.middleware.get_current_authenticated_user, + null=True, + on_delete=django.db.models.deletion.SET_DEFAULT, + on_update=True, + related_name="%(app_label)s_%(class)s_modified", + to=settings.AUTH_USER_MODEL, + ), + ), + ( + "page", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="sections", + to="tuhi.page", + ), + ), + ], + options={ + "verbose_name": "section", + }, + ), ] diff --git a/apps/tuhi/migrations/0002_pagesection.py b/apps/tuhi/migrations/0002_pagesection.py deleted file mode 100644 index 65990a9..0000000 --- a/apps/tuhi/migrations/0002_pagesection.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 5.2.dev20240719125256 on 2024-07-20 11:36 - -import django.db.models.deletion -import django_quill.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("tuhi", "0001_initial"), - ] - - operations = [ - migrations.CreateModel( - name="PageSection", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(max_length=255)), - ("content", django_quill.fields.QuillField()), - ( - "page", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="tuhi.page" - ), - ), - ], - ), - ] diff --git a/apps/tuhi/migrations/0004_pagedraft.py b/apps/tuhi/migrations/0004_pagedraft.py deleted file mode 100644 index 3a928ab..0000000 --- a/apps/tuhi/migrations/0004_pagedraft.py +++ /dev/null @@ -1,24 +0,0 @@ -# Generated by Django 5.2.dev20240719125256 on 2024-07-20 11:36 - -import django.db.models.deletion -import django_quill.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("tuhi", "0002_pagesection"), - ] - - operations = [ - migrations.RemoveField( - model_name="page", - name="content", - ), - migrations.AddField( - model_name="page", - name="draft", - field=models.BooleanField(default=True), - ), - ] diff --git a/apps/tuhi/migrations/0005_alter_pagesection_title.py b/apps/tuhi/migrations/0005_alter_pagesection_title.py deleted file mode 100644 index 08f114b..0000000 --- a/apps/tuhi/migrations/0005_alter_pagesection_title.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.2.dev20240719125256 on 2024-07-21 19:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("tuhi", "0004_pagedraft"), - ] - - operations = [ - migrations.AlterField( - model_name="pagesection", - name="title", - field=models.CharField(blank=True, default="", max_length=255), - ), - ] diff --git a/apps/tuhi/migrations/0006_alter_folder_created_by_alter_folder_modified_by.py b/apps/tuhi/migrations/0006_alter_folder_created_by_alter_folder_modified_by.py deleted file mode 100644 index 8f5d846..0000000 --- a/apps/tuhi/migrations/0006_alter_folder_created_by_alter_folder_modified_by.py +++ /dev/null @@ -1,41 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-04 16:32 - -import django.db.models.deletion -import django_currentuser.db.models.fields -import django_currentuser.middleware -from django.conf import settings -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ("tuhi", "0005_alter_pagesection_title"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AlterField( - model_name="folder", - name="created_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - related_name="%(app_label)s_%(class)s_created", - to=settings.AUTH_USER_MODEL, - ), - ), - migrations.AlterField( - model_name="folder", - name="modified_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - on_update=True, - related_name="%(app_label)s_%(class)s_modified", - to=settings.AUTH_USER_MODEL, - ), - ), - ] diff --git a/apps/tuhi/migrations/0007_pagesection_created_pagesection_created_by_and_more.py b/apps/tuhi/migrations/0007_pagesection_created_pagesection_created_by_and_more.py deleted file mode 100644 index 8e1cb97..0000000 --- a/apps/tuhi/migrations/0007_pagesection_created_pagesection_created_by_and_more.py +++ /dev/null @@ -1,55 +0,0 @@ -# Generated by Django 5.1 on 2024-08-11 13:09 - -import django.db.models.deletion -import django.utils.timezone -import django_currentuser.db.models.fields -import django_currentuser.middleware -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("tuhi", "0006_alter_folder_created_by_alter_folder_modified_by"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name="pagesection", - name="created", - field=models.DateTimeField( - auto_now_add=True, default=django.utils.timezone.now - ), - preserve_default=False, - ), - migrations.AddField( - model_name="pagesection", - name="created_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - related_name="%(app_label)s_%(class)s_created", - to=settings.AUTH_USER_MODEL, - ), - ), - migrations.AddField( - model_name="pagesection", - name="modified", - field=models.DateTimeField(auto_now=True), - ), - migrations.AddField( - model_name="pagesection", - name="modified_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - on_update=True, - related_name="%(app_label)s_%(class)s_modified", - to=settings.AUTH_USER_MODEL, - ), - ), - ] diff --git a/apps/tuhi/migrations/0008_alter_pagesection_options_alter_pagesection_page.py b/apps/tuhi/migrations/0008_alter_pagesection_options_alter_pagesection_page.py deleted file mode 100644 index 541c8ca..0000000 --- a/apps/tuhi/migrations/0008_alter_pagesection_options_alter_pagesection_page.py +++ /dev/null @@ -1,27 +0,0 @@ -# Generated by Django 5.1 on 2024-08-17 03:10 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("tuhi", "0007_pagesection_created_pagesection_created_by_and_more"), - ] - - operations = [ - migrations.AlterModelOptions( - name="pagesection", - options={"verbose_name": "section"}, - ), - migrations.AlterField( - model_name="pagesection", - name="page", - field=models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - related_name="sections", - to="tuhi.page", - ), - ), - ] diff --git a/awa/migrations/0001_initial.py b/awa/migrations/0001_initial.py index 07f7ff4..1992356 100644 --- a/awa/migrations/0001_initial.py +++ b/awa/migrations/0001_initial.py @@ -1,8 +1,10 @@ -# Generated by Django 5.0.6 on 2024-07-19 11:48 +# Generated by Django 5.1 on 2024-08-28 13:31 +import awa.models import django.db.models.deletion import django_currentuser.db.models.fields import django_currentuser.middleware +import functools from django.conf import settings from django.db import migrations, models @@ -36,15 +38,24 @@ class Migration(migrations.Migration): blank=True, height_field="icon_height", null=True, - upload_to="icons/", + upload_to=functools.partial( + awa.models.image_upload_to, *(), **{"role": "icons"} + ), width_field="icon_width", ), ), ( "icon_height", - models.PositiveSmallIntegerField(blank=True, null=True), + models.PositiveSmallIntegerField( + blank=True, editable=False, null=True + ), + ), + ( + "icon_width", + models.PositiveSmallIntegerField( + blank=True, editable=False, null=True + ), ), - ("icon_width", models.PositiveSmallIntegerField(blank=True, null=True)), ("name", models.CharField(max_length=32)), ("url", models.URLField(max_length=128)), ("header", models.BooleanField(default=False)), @@ -53,7 +64,7 @@ class Migration(migrations.Migration): django_currentuser.db.models.fields.CurrentUserField( default=django_currentuser.middleware.get_current_authenticated_user, null=True, - on_delete=django.db.models.deletion.CASCADE, + on_delete=django.db.models.deletion.SET_DEFAULT, related_name="%(app_label)s_%(class)s_created", to=settings.AUTH_USER_MODEL, ), @@ -63,7 +74,7 @@ class Migration(migrations.Migration): django_currentuser.db.models.fields.CurrentUserField( default=django_currentuser.middleware.get_current_authenticated_user, null=True, - on_delete=django.db.models.deletion.CASCADE, + on_delete=django.db.models.deletion.SET_DEFAULT, on_update=True, related_name="%(app_label)s_%(class)s_modified", to=settings.AUTH_USER_MODEL, diff --git a/awa/migrations/0002_alter_projectlink_created_by_alter_projectlink_icon_and_more.py b/awa/migrations/0002_alter_projectlink_created_by_alter_projectlink_icon_and_more.py deleted file mode 100644 index 0e43b14..0000000 --- a/awa/migrations/0002_alter_projectlink_created_by_alter_projectlink_icon_and_more.py +++ /dev/null @@ -1,70 +0,0 @@ -# Generated by Django 5.0.7 on 2024-08-06 15:01 - -import awa.models -import django.db.models.deletion -import django_currentuser.db.models.fields -import django_currentuser.middleware -import functools -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("awa", "0001_initial"), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AlterField( - model_name="projectlink", - name="created_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - related_name="%(app_label)s_%(class)s_created", - to=settings.AUTH_USER_MODEL, - ), - ), - migrations.AlterField( - model_name="projectlink", - name="icon", - field=models.ImageField( - blank=True, - height_field="icon_height", - null=True, - upload_to=functools.partial( - awa.models.image_upload_to, *(), **{"role": "icons"} - ), - width_field="icon_width", - ), - ), - migrations.AlterField( - model_name="projectlink", - name="icon_height", - field=models.PositiveSmallIntegerField( - blank=True, editable=False, null=True - ), - ), - migrations.AlterField( - model_name="projectlink", - name="icon_width", - field=models.PositiveSmallIntegerField( - blank=True, editable=False, null=True - ), - ), - migrations.AlterField( - model_name="projectlink", - name="modified_by", - field=django_currentuser.db.models.fields.CurrentUserField( - default=django_currentuser.middleware.get_current_authenticated_user, - null=True, - on_delete=django.db.models.deletion.SET_DEFAULT, - on_update=True, - related_name="%(app_label)s_%(class)s_modified", - to=settings.AUTH_USER_MODEL, - ), - ), - ] diff --git a/awa/settings.py b/awa/settings.py index 42c85db..ba8baf2 100644 --- a/awa/settings.py +++ b/awa/settings.py @@ -37,6 +37,7 @@ "apps.huri", # ui "apps.tohu", "apps.tuhi", # pages + "apps.hautaka" ] + custom_apps # SITE_ID = config.site_id or 1