Revert "Django 1.11 (#970)" (#973)

This reverts commit de4969e.

network-api/networkapi/settings.py

@@ -157,6 +157,8 @@
 
     'mezzanine.core.request.CurrentRequestMiddleware',
     'mezzanine.core.middleware.RedirectFallbackMiddleware',
+    'mezzanine.core.middleware.TemplateForDeviceMiddleware',
+    'mezzanine.core.middleware.TemplateForHostMiddleware',
     'mezzanine.core.middleware.AdminLoginInterfaceSelectorMiddleware',
     'mezzanine.core.middleware.SitePermissionMiddleware',
     'mezzanine.pages.middleware.PageMiddleware',

network-api/networkapi/utility/templatetags/adminsortable_tags_custom.py

@@ -10,11 +10,9 @@ def render_sortable_objects(
     objects,
     sortable_objects_template='adminsortable/shared/objects.html'
 ):
+    context.update({'objects': objects})
     tmpl = template.loader.get_template(sortable_objects_template)
-    return tmpl.render({
-        'objects': objects,
-        'opts': context.get('opts'),
-    })
+    return tmpl.render(context)
 
 
 @register.simple_tag(takes_context=True)
@@ -24,12 +22,9 @@ def render_nested_sortable_objects(
     group_expression,
     sortable_nested_objects_template='adminsortable/shared/nested_objects.html'
 ):
+    context.update({'objects': objects, 'group_expression': group_expression})
     tmpl = template.loader.get_template(sortable_nested_objects_template)
-    return tmpl.render({
-        'objects': objects,
-        'group_expression': group_expression,
-        'opts': context.get('opts'),
-    })
+    return tmpl.render(context)
 
 
 @register.simple_tag(takes_context=True)
@@ -38,11 +33,9 @@ def render_list_items(
     list_objects,
     sortable_list_items_template='adminsortable/shared/list_items.html'
 ):
+    context.update({'list_objects': list_objects})
     tmpl = template.loader.get_template(sortable_list_items_template)
-    return tmpl.render({
-        'list_objects': list_objects,
-        'opts': context.get('opts'),
-    })
+    return tmpl.render(context)
 
 
 @register.simple_tag(takes_context=True, name='render_object_rep')
@@ -51,13 +44,10 @@ def render_object_rep(
     obj,
     forloop
 ):
+    context.update({'object': obj, 'forloop': forloop})
     tmpl = template.loader.get_template(
         '{app_name}/adminsortable_objects_custom.html'.format(
             app_name=context.get('opts').app_label
         )
     )
-    return tmpl.render({
-        'object': obj,
-        'forloop': forloop,
-        'opts': context.get('opts'),
-    })
+    return tmpl.render(context)

requirements.txt

@@ -1,11 +1,11 @@
 # Core
-Django==1.11
+Django==1.10.8
 gunicorn==19.6.0
 djangorestframework==3.5.4
 django-filter==1.0.2
 
-# Mezzanine CMS - Use version with Django 1.11 LTS support
-git+https://github.com/stephenmcd/mezzanine@521a98c39bb6351c4b46067069f33caf95fe0a5e#egg=Mezzanine
+# Mezzanine CMS
+Mezzanine==4.2.3
 filebrowser_s3==1.0.0
 
 # social auth is useful
@@ -37,7 +37,7 @@ django-cors-headers==2.0.2
 django-csp==3.3
 
 # Admin sort models
-django-admin-sortable==2.1.2
+django-admin-sortable==2.1.0
 
 # HTTP requests
 requests==2.13.0