File merged_50489e63.patch of Package python-django-treebeard

Overview Repositories Revisions Requests Users Attributes Meta

File merged_50489e63.patch of Package python-django-treebeard (Revision a87e8c1dcc791ad20826df09cf45c5dd)

Currently displaying revision a87e8c1dcc791ad20826df09cf45c5dd , Show latest

From 50489e63a5f89f02945f5dd67168d16512a3d603 Mon Sep 17 00:00:00 2001
From: Jacob Rief <jacob.rief@gmail.com>
Date: Fri, 27 Dec 2019 16:56:55 +0100
Subject: [PATCH] Signature of ChangeList changed in Django-2.1

---
 treebeard/tests/test_treebeard.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
index 9756db8..3185582 100644
--- a/treebeard/tests/test_treebeard.py
+++ b/treebeard/tests/test_treebeard.py
@@ -5,6 +5,7 @@
 import datetime
 import os
 
+from django import VERSION as DJANGO_VERSION
 from django.contrib.admin.sites import AdminSite
 from django.contrib.admin.views.main import ChangeList
 from django.contrib.auth.models import User
@@ -2372,10 +2373,16 @@ def test_result_tree(self, model_without_proxy):
         m = admin_class(model, site)
         list_display = m.get_list_display(request)
         list_display_links = m.get_list_display_links(request, list_display)
-        cl = ChangeList(request, model, list_display, list_display_links,
-                        m.list_filter, m.date_hierarchy, m.search_fields,
-                        m.list_select_related, m.list_per_page,
-                        m.list_max_show_all, m.list_editable, m)
+        if DJANGO_VERSION < (2, 1):
+            cl = ChangeList(request, model, list_display, list_display_links,
+                            m.list_filter, m.date_hierarchy, m.search_fields,
+                            m.list_select_related, m.list_per_page,
+                            m.list_max_show_all, m.list_editable, m)
+        else:
+            cl = ChangeList(request, model, list_display, list_display_links,
+                            m.list_filter, m.date_hierarchy, m.search_fields,
+                            m.list_select_related, m.list_per_page,
+                            m.list_max_show_all, m.list_editable, m, None)
         cl.formset = None
         context = Context({'cl': cl,
                            'request': request})

Places

File merged_50489e63.patch of Package python-django-treebeard (Revision a87e8c1dcc791ad20826df09cf45c5dd)

Places