Move site notices to a seperate Django app

OpenUpSA · Jan 10, 2022 · cfaf53c · cfaf53c
1 parent b5a6969
commit cfaf53c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 11 deletions.
diff --git a/municipal_finance/admin.py b/municipal_finance/admin.py
@@ -5,7 +5,6 @@
 from django.contrib import admin
 from django_q.tasks import async_task
 from import_export.admin import ImportExportModelAdmin
-from adminsortable.admin import SortableAdmin
 
 from .models import (
     MunicipalStaffContactsUpdate,
@@ -30,7 +29,6 @@
     GrantTypesV2,
     CapitalTypeV2,
     DemarcationChanges,
-    SiteNotice,
 )
 from .resources import (
     AgedDebtorItemsV2Resource,
@@ -204,5 +202,3 @@ class DemarcationChangesAdmin(admin.ModelAdmin):
         "old_code_transition",
         "new_code_transition",
     )
-
-admin.site.register(SiteNotice, SortableAdmin)
diff --git a/municipal_finance/context_processors.py b/municipal_finance/context_processors.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.contrib.sites.shortcuts import get_current_site
-from municipal_finance import models
+from site_config import models
 
 
 def google_analytics(request):

diff --git a/municipal_finance/models/__init__.py b/municipal_finance/models/__init__.py
@@ -84,8 +84,6 @@
 )
 from .demarcation_changes import DemarcationChanges
 
-from .notice import SiteNotice
-
 
 class AuditOpinionFacts(models.Model):
     demarcation_code = models.TextField()

diff --git a/municipal_finance/settings.py b/municipal_finance/settings.py
@@ -55,6 +55,7 @@
     "infrastructure",
     "household",
     "webflow",
+    "site_config",
     "django.contrib.sites",
     "django.contrib.contenttypes",
     "django.contrib.humanize",

diff --git a/site_config/__init__.py b/site_config/__init__.py
diff --git a/site_config/admin.py b/site_config/admin.py
@@ -0,0 +1,5 @@
+from django.contrib import admin
+from adminsortable.admin import SortableAdmin
+from . import models
+
+admin.site.register(models.SiteNotice, SortableAdmin)
diff --git a/site_config/apps.py b/site_config/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class SiteConfigConfig(AppConfig):
+    name = 'site_config'
diff --git a/...pal_finance/migrations/0041_sitenotice.py → site_config/migrations/0001_initial.py b/...pal_finance/migrations/0041_sitenotice.py → site_config/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.29 on 2022-01-03 14:47
+# Generated by Django 1.11.29 on 2022-01-10 14:03
 from __future__ import unicode_literals
 
 import ckeditor.fields
@@ -8,8 +8,9 @@
 
 class Migration(migrations.Migration):
 
+    initial = True
+
     dependencies = [
-        ('municipal_finance', '0040_auto_20210222_0541'),
     ]
 
     operations = [

diff --git a/site_config/migrations/__init__.py b/site_config/migrations/__init__.py
diff --git a/municipal_finance/models/notice.py → site_config/models.py b/municipal_finance/models/notice.py → site_config/models.py
@@ -1,7 +1,6 @@
+from django.db import models
 import ckeditor.fields as ckeditor_fields
 from adminsortable.models import SortableMixin
-from django.db import models
-
 
 class SiteNotice(SortableMixin):
     description = models.CharField(max_length=200)