Status with parent only

diff --git a/app/organization/network/admin.py b/app/organization/network/admin.py
index 3103aa2c55a9eaf5fc91d8ad610ca3f74e051803..fc183a48e1a9aa8769e179c6573fc67ae69dff47 100644 (file)
--- a/app/organization/network/admin.py
+++ b/app/organization/network/admin.py
@@ -185,11 +185,6 @@ class ActivityStatusAdmin(BaseTranslationModelAdmin):
     model = ActivityStatus
 
 
-class ActivityStatusFamilyAdmin(BaseTranslationModelAdmin):
-
-    model = ActivityStatusFamily
-
-
 class TrainingTypeAdmin(BaseTranslationModelAdmin):
 
     model = TrainingType
@@ -220,7 +215,6 @@ admin.site.register(Person, PersonAdmin)
 admin.site.register(PersonListBlock, PersonListBlockAdmin)
 admin.site.register(PersonActivity, PersonActivityAdmin)
 admin.site.register(ActivityStatus, ActivityStatusAdmin)
-admin.site.register(ActivityStatusFamily, ActivityStatusFamilyAdmin)
 admin.site.register(ActivityGrade, ActivityGradeAdmin)
 admin.site.register(ActivityFramework, ActivityFrameworkAdmin)
 admin.site.register(ActivityFunction, ActivityFunctionAdmin)

diff --git a/app/organization/network/migrations/0061_auto_20161114_1517.py b/app/organization/network/migrations/0061_auto_20161114_1517.py
new file mode 100644 (file)
index 0000000..b842c0f
--- /dev/null
+++ b/app/organization/network/migrations/0061_auto_20161114_1517.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-11-14 14:17
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0060_auto_20161113_2253'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='activitystatus',
+            name='family',
+        ),
+        migrations.AddField(
+            model_name='activitystatus',
+            name='parent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='organization-network.ActivityStatus', verbose_name='parent'),
+        ),
+        migrations.DeleteModel(
+            name='ActivityStatusFamily',
+        ),
+    ]

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index c1595695d37206c430b77155da117f29785b2a9e..cb51d4c209e3a647a642d0a9db840a45c4d6f95a 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -73,7 +73,7 @@ class Organization(Named, Address, URL, AdminThumbRelatedMixin):
     telephone = models.CharField(_('telephone'), max_length=64, blank=True, null=True)
     opening_times = models.TextField(_('opening times'), blank=True)
     subway_access = models.TextField(_('subway access'), blank=True)
-    
+
     admin_thumb_type = 'logo'
 
     class Meta:
@@ -321,21 +321,11 @@ class PersonListBlockInline(models.Model):
         verbose_name = _('Person autocomplete')
 
 
-class ActivityStatusFamily(Named):
-
-    order = models.IntegerField(_('order number'), default=100)
-    display = models.BooleanField(_('display on team page'), blank=True, default=True)
-
-    class Meta:
-        verbose_name = _('Status family')
-        ordering = ['order']
-
-
 class ActivityStatus(Named):
 
     order = models.IntegerField(_('order number'), default=100)
     display = models.BooleanField(_('display on team page'), blank=True, default=True)
-    family = models.ForeignKey(ActivityStatusFamily, verbose_name=_('family'), related_name='activity_statuses', blank=True, null=True, on_delete=models.SET_NULL)
+    parent = models.ForeignKey('ActivityStatus', verbose_name=_('parent'), related_name='children', blank=True, null=True, on_delete=models.SET_NULL)
 
     class Meta:
         verbose_name = _('status')

diff --git a/app/organization/network/translation.py b/app/organization/network/translation.py
index c99ce5db4a37dcbabb91c06e0b9828838d601f23..c1f038e5ccd174f8b567c2c486fae243c0f321fa 100644 (file)
--- a/app/organization/network/translation.py
+++ b/app/organization/network/translation.py
@@ -141,12 +141,6 @@ class ActivityFrameworkTranslationOptions(TranslationOptions):
     fields = ['name', 'description']
 
 
-@register(ActivityStatusFamily)
-class ActivityStatusFamilyTranslationOptions(TranslationOptions):
-
-    fields = ['name', 'description',]
-
-
 @register(ActivityStatus)
 class ActivityStatusTranslationOptions(TranslationOptions):
 

diff --git a/scripts/migrate.sh b/scripts/migrate.sh
index 90aaae33b08e1f030c60ae57cfc134d5d3e8d1e8..b561bbfa898dcb92a784e05cf5b4a83274cfd871 100755 (executable)
--- a/scripts/migrate.sh
+++ b/scripts/migrate.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py migrate $1
+docker-compose run app python /srv/app/manage.py migrate