Merge pull request #443 from okfn/202008-upgrades

Update to django 1.11

Dockerfile

@@ -14,7 +14,6 @@ COPY deployment/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY deployment/gunicorn.conf /etc/supervisor/conf.d/gunicorn.conf
 
 COPY article_list_item ./article_list_item
-COPY contrib ./contrib
 COPY docs ./docs
 COPY foundation ./foundation
 COPY lib ./lib
@@ -37,4 +36,8 @@ EXPOSE $PORT
 
 RUN python manage.py collectstatic --noinput
 
-CMD python manage.py migrate && python manage.py update_index && /usr/bin/supervisord
+CMD python manage.py migrate cms 0016 --settings foundation.temp_migration_settings &&\
+    python manage.py migrate easy_thumbnails &&\
+    python manage.py migrate &&\
+    python manage.py update_index &&\
+    /usr/bin/supervisord

article_list_item/migrations/0008_auto_20200824_1033.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-08-24 10:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('article_list_item', '0007_auto_20180424_1119'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='articlelistitemplugin',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='article_list_item_articlelistitemplugin', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]

foundation/jobs/urls.py

@@ -1,9 +1,8 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import JobListView, JobHelperView
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', JobListView.as_view(), name='jobs-list'),
     url(r'^helper/$', JobHelperView.as_view()),
-    )
+]

foundation/organisation/cms_app.py → foundation/organisation/cms_apps.py

@@ -1,7 +1,7 @@
 from cms.app_base import CMSApp
 from cms.apphook_pool import apphook_pool
 from django.utils.translation import ugettext_lazy as _
-from .menu import ProjectMenu, ThemeMenu
+from .cms_menus import ProjectMenu, ThemeMenu
 
 
 class UnitsAppHook(CMSApp):

foundation/organisation/cms_plugins.py

@@ -1,11 +1,10 @@
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 from cms.models.pluginmodel import CMSPlugin
 from cms.extensions.extension_pool import extension_pool
 
-from sorl.thumbnail import get_thumbnail
-
 from .models import (Project, Theme, FeaturedTheme, FeaturedProject,
                      ProjectList, NetworkGroup, NetworkGroupList, WorkingGroup,
                      SignupForm, SideBarExtension)
@@ -22,8 +21,7 @@ def icon_alt(self, instance):
         return 'Theme: %s' % instance.theme.name
 
     def icon_src(self, instance):
-        im = get_thumbnail(instance.theme.picture, '50x50', quality=99)
-        return im.url
+        return settings.STATIC_URL + "cms/img/icons/plugins/snippet.png"
 
     def render(self, context, instance, placeholder):
         context = super(FeaturedThemePlugin, self)\
@@ -102,6 +100,12 @@ class NetworkGroupFlagsPlugin(CMSPluginBase):
     render_template = "organisation/networkgroup_flags.html"
     text_enabled = True
 
+    def icon_alt(self, instance):
+        return 'Network Group Flags: %s' % instance.theme.name
+
+    def icon_src(self, instance):
+        return settings.STATIC_URL + "cms/img/icons/plugins/snippet.png"
+
     def render(self, context, instance, placeholder):
         context = super(NetworkGroupFlagsPlugin, self)\
             .render(context, instance, placeholder)
@@ -123,6 +127,12 @@ class WorkingGroupPlugin(CMSPluginBase):
     render_template = "organisation/workinggroup_shortlist.html"
     text_enabled = True
 
+    def icon_alt(self, instance):
+        return 'Working Groups'
+
+    def icon_src(self, instance):
+        return settings.STATIC_URL + "cms/img/icons/plugins/snippet.png"
+
     def render(self, context, instance, placeholder):
         context = super(WorkingGroupPlugin, self)\
             .render(context, instance, placeholder)

foundation/organisation/migrations/0001_initial.py

@@ -2,7 +2,6 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
-import geoposition.fields
 import django_countries.fields
 
 
@@ -74,7 +73,7 @@ class Migration(migrations.Migration):
                 ('youtube_url', models.URLField(blank=True)),
                 ('gplus_url', models.URLField(verbose_name=b'Google+ url', blank=True)),
                 ('wiki_url', models.URLField(blank=True)),
-                ('position', geoposition.fields.GeopositionField(max_length=42, null=True, blank=True)),
+                ('position', models.CharField(max_length=42, null=True, blank=True)),
                 ('extra_information', models.TextField(null=True, blank=True)),
             ],
             options={

foundation/organisation/migrations/0013_update_country_slugs.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisation', '0012_auto_20191204_1651'),
+    ]
+
+    operations = [
+        migrations.RunSQL(
+            sql=["UPDATE organisation_networkgroup SET country_slug='czechia' WHERE country_slug='czech-republic';"],
+            reverse_sql=["UPDATE organisation_networkgroup SET country_slug='czech-republic' WHERE country_slug='czechia';"]
+        ),
+        migrations.RunSQL(
+            sql=["UPDATE organisation_networkgroup SET country_slug='north-macedonia' WHERE country_slug='macedonia';"],
+            reverse_sql=["UPDATE organisation_networkgroup SET country_slug='macedonia' WHERE country_slug='north-macedonia';"]
+        )
+    ]

foundation/organisation/migrations/0014_auto_20200824_1033.py

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-08-24 10:33
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisation', '0013_update_country_slugs'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='featuredproject',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='organisation_featuredproject', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='featuredtheme',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='organisation_featuredtheme', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='networkgrouplist',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='organisation_networkgrouplist', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='projectlist',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='organisation_projectlist', serialize=False, to='cms.CMSPlugin'),
+        ),
+        migrations.AlterField(
+            model_name='signupform',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, related_name='organisation_signupform', serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]

foundation/organisation/migrations/0015_remove_networkgroup_position.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-08-24 10:37
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisation', '0014_auto_20200824_1033'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='networkgroup',
+            name='position',
+        ),
+    ]

foundation/organisation/models.py

@@ -6,7 +6,6 @@
 from django.db import models
 from django.utils.text import slugify
 from django_countries.fields import CountryField
-from geoposition.fields import GeopositionField
 
 
 class Person(models.Model):
@@ -319,8 +318,6 @@ class NetworkGroup(models.Model):
     facebook_url = models.URLField(blank=True)
     forum_group_url = models.URLField(blank=True)
 
-    position = GeopositionField(blank=True, null=True)
-
     extra_information = models.TextField(blank=True, null=True)
 
     members = models.ManyToManyField('Person',

foundation/organisation/templates/organisation/member.html

@@ -1,5 +1,4 @@
 {% load markdown_deux_tags %}
-{% load thumbnail %}
 {% load staticfiles %}
 
 {% with person=member.person %}

foundation/organisation/templates/organisation/project_detail.html

@@ -14,12 +14,11 @@
     {% endwith %}
   </div>
   <div class="sidebar col-md-3 col-md-pull-9">
-    {% thumbnail object.picture "263" format="PNG" as im %}
-      <img
-        class="img-responsive"
-        src="{{ im.url }}"
-        alt="Logo/banner for {{ object.name}}">
-    {% endthumbnail %}
+    <img
+      class="img-responsive"
+      src="{% thumbnail project.picture 263x263 %}"
+      alt="Logo/banner for {{ object.name }}"
+    >
   </div>
 {% else %}
   <div class="main col-md-12">

foundation/organisation/templates/organisation/project_featured.html

@@ -1,13 +1,11 @@
 {% load markdown_deux_tags %}
 {% load thumbnail %}
 <div class="featured-project col-md-4 col-sm-6">
-  <a href="{% url 'project' slug=project.slug %}" title="{{ project.name }}">
     <h3 class="sr-only">{{ project.name }}</h3>
-    {% thumbnail project.banner "375" format="PNG" as im %}
-    <img class="img-responsive"
-         src="{{ im.url }}"
-         alt="Banner for {{ project.name }}">
-    {% endthumbnail %}
-  </a>
+    <img
+      class="img-responsive"
+      src="{% thumbnail project.picture 375x375 %}"
+      alt="Banner for {{ project.name }}"
+    >
   <p class="featured-project-teaser">{{ project.teaser }}</p>
 </div>

foundation/organisation/templates/organisation/project_list.html

@@ -14,11 +14,7 @@
 {% for project in object_list %}
 <div class="row">
   <div class="profile">
-    <a class="image" href="{{ project.homepage_url | default:'#' }}" {% if project.picture %} style='background-image: url({{project.picture.url}})'{% endif %}>
-        {% thumbnail project.picture "132" as im %}
-          <img src="{{ im.url }}" alt="" />
-        {% endthumbnail %}
-    </a>
+    <img src="{% thumbnail project.picture 132x132 %}" alt="" />
     <h3 class="name">{{ project.name }}</h3>
 
     {{ project.teaser|markdown }}

foundation/organisation/templates/organisation/project_list_plugin.html

@@ -2,10 +2,8 @@
 {% if projects %}
 <div class="list-group">
 {% for project in projects %}
-  <a href="{% url 'project' slug=project.slug %}" class="list-group-item">
-    <h4 class="list-group-item-heading">{{ project.name }}</h4>
-    <p class="list-group-item-text">{{ project.teaser }}</p>
-  </a>
+  <h4 class="list-group-item-heading">{{ project.name }}</h4>
+  <p class="list-group-item-text">{{ project.teaser }}</p>
 {% endfor %}
 </div>
 {% else %}