浏览代码

Change BoundPanel.render method to render_html

Matt Westcott 3 年之前
父节点
当前提交
4eef367241

+ 7 - 7
wagtail/admin/panels.py

@@ -274,12 +274,12 @@ class Panel:
             return True
 
         def render_as_object(self):
-            return self.render()
+            return self.render_html()
 
         def render_as_field(self):
-            return self.render()
+            return self.render_html()
 
-        def render(self):
+        def render_html(self):
             return render_to_string(self.panel.template, {"self": self})
 
         def html_declarations(self):
@@ -558,7 +558,7 @@ class HelpPanel(Panel):
             super().__init__(panel, instance, request, form)
             self.content = self.panel.content
 
-        def render(self):
+        def render_html(self):
             return render_to_string(self.panel.template, {"self": self})
 
 
@@ -938,7 +938,7 @@ class InlinePanel(Panel):
                 )
             ]
 
-        def render(self):
+        def render_html(self):
             formset = render_to_string(
                 self.panel.template,
                 {
@@ -990,7 +990,7 @@ class PrivacyModalPanel(Panel):
         super().__init__(**updated_kwargs)
 
     class BoundPanel(Panel.BoundPanel):
-        def render(self):
+        def render_html(self):
             content = render_to_string(
                 self.panel.template,
                 {"self": self, "page": self.instance, "request": self.request},
@@ -1079,7 +1079,7 @@ class CommentPanel(Panel):
                 "comments_data": comments_data,
             }
 
-        def render(self):
+        def render_html(self):
             panel = render_to_string(self.panel.template, self.get_context())
             return panel
 

+ 2 - 2
wagtail/admin/tests/test_edit_handlers.py

@@ -415,7 +415,7 @@ class TestTabbedInterface(TestCase):
             request=self.request,
         )
 
-        result = tabbed_interface.render()
+        result = tabbed_interface.render_html()
 
         # result should contain tab buttons
         self.assertIn(
@@ -505,7 +505,7 @@ class TestObjectList(TestCase):
             request=self.request,
         )
 
-        result = object_list.render()
+        result = object_list.render_html()
 
         # result should contain ObjectList furniture
         self.assertIn('<ul class="objects">', result)

+ 1 - 1
wagtail/contrib/forms/panels.py

@@ -13,7 +13,7 @@ class FormSubmissionsPanel(Panel):
             self.heading = _("%s submissions") % self.model.get_verbose_name()
 
     class BoundPanel(Panel.BoundPanel):
-        def render(self):
+        def render_html(self):
             form_page_model = self.panel.model
             form_submissions_model = form_page_model().get_submission_class()
             submissions = form_submissions_model.objects.filter(page=self.instance)

+ 4 - 4
wagtail/contrib/forms/tests/test_views.py

@@ -62,7 +62,7 @@ class TestFormResponsesPanel(TestCase):
             },
         )
 
-        result = self.panel.render()
+        result = self.panel.render_html()
 
         url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
         link = '<a href="{}">1</a>'.format(url)
@@ -71,7 +71,7 @@ class TestFormResponsesPanel(TestCase):
 
     def test_render_without_submissions(self):
         """The panel should not be shown if the number of submission is zero."""
-        result = self.panel.render()
+        result = self.panel.render_html()
 
         self.assertEqual("", result)
 
@@ -114,7 +114,7 @@ class TestFormResponsesPanelWithCustomSubmissionClass(TestCase, WagtailTestUtils
         new_form_submission.submit_time = "2017-08-29T12:00:00.000Z"
         new_form_submission.save()
 
-        result = self.panel.render()
+        result = self.panel.render_html()
 
         url = reverse("wagtailforms:list_submissions", args=(self.form_page.id,))
         link = '<a href="{}">1</a>'.format(url)
@@ -123,7 +123,7 @@ class TestFormResponsesPanelWithCustomSubmissionClass(TestCase, WagtailTestUtils
 
     def test_render_without_submissions(self):
         """The panel should not be shown if the number of submission is zero."""
-        result = self.panel.render()
+        result = self.panel.render_html()
 
         self.assertEqual("", result)