From ae47c4cbb03c1b06dca7c559bcb00754b47dbb00 Mon Sep 17 00:00:00 2001
From: Artur Barseghyan <artur.barseghyan@gmail.com>
Date: Fri, 8 Jul 2022 00:18:23 +0200
Subject: [PATCH] More

---
 src/fobi/views/class_based.py | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/fobi/views/class_based.py b/src/fobi/views/class_based.py
index 39c4cf9a..4a43ff2b 100644
--- a/src/fobi/views/class_based.py
+++ b/src/fobi/views/class_based.py
@@ -60,8 +60,13 @@ class CreateFormEntryView(CreateView):
         """Get context data."""
         context = super().get_context_data(**kwargs)
         context["form"] = self.get_form()
-        if self.theme:
-            context.update({"fobi_theme": self.theme})
+        if not self.theme:
+            theme = get_theme(request=self.request, as_instance=True)
+        else:
+            theme = self.theme
+
+        if theme:
+            context.update({"fobi_theme": theme})
         return context
 
     def get_template_names(self):
@@ -178,15 +183,15 @@ class EditFormEntryView(UpdateView):
 
         # If no theme provided, pick a default one.
         if not self.theme:
-            self.theme = get_theme(request=self.request, as_instance=True)
+            theme = get_theme(request=self.request, as_instance=True)
+        else:
+            theme = self.theme
 
-        if self.theme:
-            context.update({"fobi_theme": self.theme})
+        if theme:
+            context.update({"fobi_theme": theme})
 
-        self.theme.collect_plugin_media(form_elements)
+        theme.collect_plugin_media(form_elements)
 
-        # context["form"] = self.get_form()
-        # context["form_entry"] = self.object
         context.update(
             {
                 "form": self.get_form(),
@@ -196,7 +201,7 @@ class EditFormEntryView(UpdateView):
                 "user_form_element_plugins": user_form_element_plugins,
                 "user_form_handler_plugins": user_form_handler_plugins,
                 "assembled_form": assembled_form,
-                "fobi_theme": self.theme,
+                "fobi_theme": theme,
             }
         )
 
@@ -234,9 +239,7 @@ class EditFormEntryView(UpdateView):
         )
         return self.render_to_response(
             self.get_context_data(
-                extra_context={
-                    "form_element_entry_formset": form_element_entry_formset,
-                }
+                form_element_entry_formset=form_element_entry_formset,
             )
         )
 
@@ -317,8 +320,6 @@ class EditFormEntryView(UpdateView):
 
         return self.render_to_response(
             self.get_context_data(
-                extra_context={
-                    "form_element_entry_formset": form_element_entry_formset,
-                }
+                form_element_entry_formset=form_element_entry_formset,
             )
         )