TeamAdmin and DepartmentAdmin, add content translations

diff --git a/app/migrations/pages/0002_auto_20160725_0143.py b/app/migrations/pages/0002_auto_20160725_0143.py
new file mode 100644 (file)
index 0000000..d6871f0
--- /dev/null
+++ b/app/migrations/pages/0002_auto_20160725_0143.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-24 23:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+import mezzanine.pages.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pages', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='page',
+            name='in_menus',
+            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer vertical'), (4, 'Footer horizontal')], max_length=100, null=True, verbose_name='Show in menus'),
+        ),
+    ]

diff --git a/app/organization/team/admin.py b/app/organization/team/admin.py
index 78d3477a05e4577caa2bc90d97144516888d65ce..efd91b6072965bb0bf272da910147024553fe4d1 100644 (file)
--- a/app/organization/team/admin.py
+++ b/app/organization/team/admin.py
@@ -2,6 +2,7 @@ from django.contrib import admin
 from django import forms
 from copy import deepcopy
 from mezzanine.core.admin import *
+from mezzanine.pages.admin import PageAdmin
 from organization.team.models import *
 
 
@@ -10,16 +11,6 @@ class OrganizationAdmin(BaseTranslationModelAdmin):
     model = Organization
 
 
-class DepartmentAdmin(BaseTranslationModelAdmin):
-
-    model = Department
-
-
-class TeamAdmin(BaseTranslationModelAdmin):
-
-    model = Team
-
-
 class ActivityAdmin(BaseTranslationModelAdmin):
 
     model = Activity
@@ -52,7 +43,7 @@ class PersonAdmin(BaseTranslationModelAdmin):
 
 admin.site.register(Organization, OrganizationAdmin)
 admin.site.register(OrganizationType)
-admin.site.register(Department, DepartmentAdmin)
-admin.site.register(Team, TeamAdmin)
+admin.site.register(Department, PageAdmin)
+admin.site.register(Team, PageAdmin)
 admin.site.register(Person, PersonAdmin)
 admin.site.register(Activity, ActivityAdmin)

diff --git a/app/organization/team/migrations/0009_auto_20160725_0143.py b/app/organization/team/migrations/0009_auto_20160725_0143.py
new file mode 100644 (file)
index 0000000..409e985
--- /dev/null
+++ b/app/organization/team/migrations/0009_auto_20160725_0143.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-24 23:43
+from __future__ import unicode_literals
+
+from django.db import migrations
+import mezzanine.core.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-team', '0008_auto_20160725_0117'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='department',
+            name='content_en',
+            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
+        ),
+        migrations.AddField(
+            model_name='department',
+            name='content_fr',
+            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
+        ),
+        migrations.AddField(
+            model_name='team',
+            name='content_en',
+            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
+        ),
+        migrations.AddField(
+            model_name='team',
+            name='content_fr',
+            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
+        ),
+    ]

diff --git a/app/organization/team/translation.py b/app/organization/team/translation.py
index b9712626bf3c10642a25ba6b431304ea7ee444f9..837f4c45afff449f3d301b30df5179d6b109f785 100644 (file)
--- a/app/organization/team/translation.py
+++ b/app/organization/team/translation.py
@@ -11,11 +11,13 @@ class OrganizationTranslationOptions(TranslationOptions):
 
 @register(Department)
 class DepartmentTranslationOptions(TranslationOptions):
-    pass
+
+    fields = ('content',)
 
 @register(Team)
 class TeamTranslationOptions(TranslationOptions):
-    pass
+
+    fields = ('content',)
 
 @register(Person)
 class PersonTranslationOptions(TranslationOptions):