From 7e886429180d53da21f6de771b51062839fc3e4a Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Wed, 17 Oct 2018 15:48:14 +0200 Subject: [PATCH] Remove order property from module --- client/src/main.js | 1 + .../migrations/0004_remove_module_order.py | 17 +++++++++++++ server/books/models/module.py | 1 - .../migrations/0002_auto_20181017_1340.py | 25 +++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 server/books/migrations/0004_remove_module_order.py create mode 100644 server/users/migrations/0002_auto_20181017_1340.py diff --git a/client/src/main.js b/client/src/main.js index 0ce8bf48..882e45f1 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -45,6 +45,7 @@ Vue.use(VueScrollTo, { offset: -50 }); +// taken from https://stackoverflow.com/questions/36170425/detect-click-outside-element Vue.directive('click-outside', { bind(el, binding, vnode) { el.clickOutsideEvent = event => { diff --git a/server/books/migrations/0004_remove_module_order.py b/server/books/migrations/0004_remove_module_order.py new file mode 100644 index 00000000..bda3fcc1 --- /dev/null +++ b/server/books/migrations/0004_remove_module_order.py @@ -0,0 +1,17 @@ +# Generated by Django 2.0.6 on 2018-10-17 13:40 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('books', '0003_auto_20181015_1202'), + ] + + operations = [ + migrations.RemoveField( + model_name='module', + name='order', + ), + ] diff --git a/server/books/models/module.py b/server/books/models/module.py index b6ebc0de..32d7131b 100644 --- a/server/books/models/module.py +++ b/server/books/models/module.py @@ -16,7 +16,6 @@ class Module(StrictHierarchyPage): verbose_name = 'Modul' verbose_name_plural = 'Module' - order = models.PositiveIntegerField(null=False, blank=False, help_text='Order of the module') meta_title = models.CharField( max_length=255, help_text='e.g. \'Intro\' or \'Modul 1\'' diff --git a/server/users/migrations/0002_auto_20181017_1340.py b/server/users/migrations/0002_auto_20181017_1340.py new file mode 100644 index 00000000..4563855a --- /dev/null +++ b/server/users/migrations/0002_auto_20181017_1340.py @@ -0,0 +1,25 @@ +# Generated by Django 2.0.6 on 2018-10-17 13:40 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='userrole', + name='role', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_roles', to='users.Role'), + ), + migrations.AlterField( + model_name='userrole', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_roles', to=settings.AUTH_USER_MODEL), + ), + ]