From 52360ae1052c6b47be1cfd6f72fbc3dea19e892b Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Mon, 16 Oct 2017 10:59:59 +0200
Subject: [PATCH] Cleaned up migrations, tweak settings

---
 feedler/migrations/0007_auto_20171013_1515.py | 33 -------------------
 ...013_2342.py => 0007_auto_20171016_1059.py} | 19 +++++++++--
 feedler/wagtail_hooks.py                      |  2 +-
 publichealth/home/models/admin.py             |  3 +-
 publichealth/settings/dev.py                  |  4 +++
 5 files changed, 23 insertions(+), 38 deletions(-)
 delete mode 100644 feedler/migrations/0007_auto_20171013_1515.py
 rename feedler/migrations/{0008_auto_20171013_2342.py => 0007_auto_20171016_1059.py} (62%)

diff --git a/feedler/migrations/0007_auto_20171013_1515.py b/feedler/migrations/0007_auto_20171013_1515.py
deleted file mode 100644
index 458fffd..0000000
--- a/feedler/migrations/0007_auto_20171013_1515.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2017-10-13 13:15
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('feedler', '0006_auto_20171012_1458'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='feedlysettings',
-            old_name='feedly_stream',
-            new_name='streams',
-        ),
-        migrations.RemoveField(
-            model_name='feedlysettings',
-            name='feedly_auth',
-        ),
-        migrations.RemoveField(
-            model_name='feedlysettings',
-            name='feedly_pages',
-        ),
-        migrations.AddField(
-            model_name='feedlysettings',
-            name='token',
-            field=models.CharField(blank=True, help_text='Access Token from developer.feedly.com', max_length=255),
-        ),
-    ]
diff --git a/feedler/migrations/0008_auto_20171013_2342.py b/feedler/migrations/0007_auto_20171016_1059.py
similarity index 62%
rename from feedler/migrations/0008_auto_20171013_2342.py
rename to feedler/migrations/0007_auto_20171016_1059.py
index f958257..fa988ac 100644
--- a/feedler/migrations/0008_auto_20171013_2342.py
+++ b/feedler/migrations/0007_auto_20171016_1059.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2017-10-13 21:42
+# Generated by Django 1.11.6 on 2017-10-16 08:59
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -8,16 +8,29 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('feedler', '0007_auto_20171013_1515'),
+        ('feedler', '0006_auto_20171012_1458'),
     ]
 
     operations = [
+        migrations.RenameField(
+            model_name='feedlysettings',
+            old_name='feedly_stream',
+            new_name='streams',
+        ),
+        migrations.RemoveField(
+            model_name='feedlysettings',
+            name='feedly_auth',
+        ),
+        migrations.RemoveField(
+            model_name='feedlysettings',
+            name='feedly_pages',
+        ),
         migrations.AddField(
             model_name='feedlysettings',
             name='refresh',
             field=models.CharField(blank=True, help_text='Refresh Token for automatic update (pro account)', max_length=1024),
         ),
-        migrations.AlterField(
+        migrations.AddField(
             model_name='feedlysettings',
             name='token',
             field=models.CharField(blank=True, help_text='Access Token from feedly.com/v3/auth/dev', max_length=1024),
diff --git a/feedler/wagtail_hooks.py b/feedler/wagtail_hooks.py
index b40200f..0129417 100644
--- a/feedler/wagtail_hooks.py
+++ b/feedler/wagtail_hooks.py
@@ -21,7 +21,7 @@ modeladmin_register(EntryModelAdmin)
 class StreamModelAdmin(ModelAdmin):
     model = Stream
     menu_icon = 'date'
-    menu_order = 1000
+    menu_order = 900
     add_to_settings_menu = True
     exclude_from_explorer = True
     list_display = ('title', 'ident')
diff --git a/publichealth/home/models/admin.py b/publichealth/home/models/admin.py
index 8d58946..e250a41 100644
--- a/publichealth/home/models/admin.py
+++ b/publichealth/home/models/admin.py
@@ -9,7 +9,7 @@ from wagtail.contrib.settings.models import BaseSetting, register_setting
 
 # A simple feedback module built into the site admin
 
-@register_setting
+@register_setting(icon='help')
 class DataletsSettings(BaseSetting):
     feedback_question = models.TextField(verbose_name='Name',
         help_text='Who should we reply to for questions?', blank=True)
@@ -42,3 +42,4 @@ def handle_save_settings(sender, instance, *args, **kwargs):
         instance.feedback_status = None
         instance.feedback_question = ""
         instance.feedback_comment = ""
+        instance.save()
diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py
index a22cce2..e855f5d 100644
--- a/publichealth/settings/dev.py
+++ b/publichealth/settings/dev.py
@@ -21,6 +21,10 @@ DATABASES = {
     }
 }
 
+INSTALLED_APPS = INSTALLED_APPS + [
+    'wagtail.contrib.wagtailstyleguide',
+]
+
 try:
     from .local import *
 except ImportError: