File merged_d6f117f0.patch of Package python-django-treebeard

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision a87e8c1dcc791ad20826df09cf45c5dd , Show latest

From d6f117f0da2984bb6364ce2a3e1feea654362ab8 Mon Sep 17 00:00:00 2001
From: Jacob Rief <jacob.rief@gmail.com>
Date: Fri, 27 Dec 2019 17:40:10 +0100
Subject: [PATCH] refactor all occurences of ChangeList

---
 treebeard/tests/test_treebeard.py | 105 ++++++++++++++++++++++--------
 1 file changed, 77 insertions(+), 28 deletions(-)

diff --git a/treebeard/tests/test_treebeard.py b/treebeard/tests/test_treebeard.py
index 5fa2c99..fbf86f3 100644
--- a/treebeard/tests/test_treebeard.py
+++ b/treebeard/tests/test_treebeard.py
@@ -2409,6 +2409,7 @@ def test_unicode_result_tree(self, model_with_unicode):
         # Add a unicode description
         model.add_root(desc='áéîøü')
         request = RequestFactory().get('/admin/tree/')
+        request.user = AnonymousUser()
         site = AdminSite()
         form_class = movenodeform_factory(model)
         ModelAdmin = admin_factory(form_class)
@@ -2419,10 +2420,16 @@ class UnicodeModelAdmin(ModelAdmin):
         m = UnicodeModelAdmin(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})
@@ -2445,16 +2452,23 @@ def test_result_filtered(self, model_without_proxy):
         model = model_without_proxy
         # Filtered GET
         request = RequestFactory().get('/admin/tree/?desc=1')
+        request.user = AnonymousUser()
         site = AdminSite()
         form_class = movenodeform_factory(model)
         admin_class = admin_factory(form_class)
         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})
@@ -2465,12 +2479,19 @@ def test_result_filtered(self, model_without_proxy):
 
         # Not Filtered GET, it should ignore pagination
         request = RequestFactory().get('/admin/tree/?p=1')
+        request.user = AnonymousUser()
         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})
@@ -2481,12 +2502,19 @@ def test_result_filtered(self, model_without_proxy):
 
         # Not Filtered GET, it should ignore all
         request = RequestFactory().get('/admin/tree/?all=1')
+        request.user = AnonymousUser()
         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})
@@ -2507,16 +2535,23 @@ def test_result_tree_list(self, model_without_proxy):
         """
         model = model_without_proxy
         request = RequestFactory().get('/admin/tree/')
+        request.user = AnonymousUser()
         site = AdminSite()
         form_class = movenodeform_factory(model)
         admin_class = admin_factory(form_class)
         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})
@@ -2530,16 +2565,23 @@ def test_result_tree_list(self, model_without_proxy):
     def test_result_tree_list_with_action(self, model_without_proxy):
         model = model_without_proxy
         request = RequestFactory().get('/admin/tree/')
+        request.user = AnonymousUser()
         site = AdminSite()
         form_class = movenodeform_factory(model)
         admin_class = admin_factory(form_class)
         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,
@@ -2559,6 +2601,7 @@ def test_result_tree_list_with_get(self, model_without_proxy):
         # Test t GET parameter with value id
         request = RequestFactory().get(
             '/admin/tree/?{0}=id'.format(TO_FIELD_VAR))
+        request.user = AnonymousUser()
         site = AdminSite()
         admin_register_all(site)
         form_class = movenodeform_factory(model)
@@ -2566,10 +2609,16 @@ def test_result_tree_list_with_get(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_d6f117f0.patch of Package python-django-treebeard (Revision a87e8c1dcc791ad20826df09cf45c5dd)

Places