Avoid double asignment

django-cms · Jul 13, 2024 · a897942 · a897942
1 parent 0b7fe32
commit a897942
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/djangocms_versioning/cms_toolbars.py b/djangocms_versioning/cms_toolbars.py
@@ -299,13 +299,15 @@ def get_page_content(self, language: Optional[str] = None) -> PageContent:
             language = self.current_lang
 
         if self.page_content and self.page_content.language == language:
+            # Already known - no need to query it again
             return self.page_content
         toolbar_obj = self.toolbar.get_object()
         if toolbar_obj and toolbar_obj.language == language:
-            self.page_content = self.toolbar.get_object()
+            # Already in the toolbar, then use it!
+            return self.toolbar.get_object()
         else:
-            self.page_content = get_latest_admin_viewable_content(self.page, language=language)
-        return self.page_content
+            # Get it from the DB
+            return get_latest_admin_viewable_content(self.page, language=language)
 
     def populate(self):
         self.page = self.request.current_page