Add organization.site to allow host orga filtering by site

diff --git a/app/migrations/pages/0006_auto_20170223_2352.py b/app/migrations/pages/0006_auto_20170223_2352.py
new file mode 100644 (file)
index 0000000..275999a
--- /dev/null
+++ b/app/migrations/pages/0006_auto_20170223_2352.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-23 22:52
+from __future__ import unicode_literals
+
+from django.db import migrations
+import mezzanine.pages.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pages', '0005_auto_20160923_1219'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='page',
+            name='in_menus',
+            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Header'), (3, 'Footer vertical'), (4, 'Footer horizontal'), (5, 'Magazine'), (6, 'You are')], max_length=100, null=True, verbose_name='Show in menus'),
+        ),
+    ]

diff --git a/app/organization/core/context_processors.py b/app/organization/core/context_processors.py
index 2baeea5036fffddf4807cb35c3832cd7b32f9ae5..e0cdabedfe235567923249afd884b3e469f67e97 100644 (file)
--- a/app/organization/core/context_processors.py
+++ b/app/organization/core/context_processors.py
@@ -23,6 +23,8 @@ from django.conf import settings # import the settings file
 from datetime import datetime, date
 from organization.pages.models import Page
 from organization.network.models import Organization, OrganizationLinkedInline
+from mezzanine.utils.sites import current_site_id
+
 
 def settings(request):
     date_now = datetime.now()

diff --git a/app/organization/network/migrations/0088_organization_site.py b/app/organization/network/migrations/0088_organization_site.py
new file mode 100644 (file)
index 0000000..4f99630
--- /dev/null
+++ b/app/organization/network/migrations/0088_organization_site.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-23 22:52
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sites', '0002_alter_domain_unique'),
+        ('organization-network', '0087_auto_20170214_1643'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organization',
+            name='site',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='sites.Site'),
+        ),
+    ]

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index 9d30483e40394ef048491aa2621fc41dfdd530ef..22d0eb3f6c14ee373ee30ce2152c074255b8bbd1 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -127,6 +127,7 @@ class Organization(Named, Address, URL, AdminThumbRelatedMixin, Orderable):
     opening_times = models.TextField(_('opening times'), blank=True)
     subway_access = models.TextField(_('subway access'), blank=True)
     bio = models.TextField(_('bio'), blank=True)
+    site = models.ForeignKey("sites.Site", blank=True, null=True, on_delete=models.SET_NULL)
     admin_thumb_type = 'logo'
 
     class Meta: