From ce25902c30824ea638e1044c3f584fdafb9cdf12 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sun, 8 Jan 2023 23:45:16 -0500
Subject: [PATCH] fix layout editor

---
 journal/templates/profile.html | 14 +++++---------
 journal/views.py               |  3 +--
 users/models.py                |  3 ---
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/journal/templates/profile.html b/journal/templates/profile.html
index 270319e6..52ef6ee3 100644
--- a/journal/templates/profile.html
+++ b/journal/templates/profile.html
@@ -171,22 +171,18 @@
             <script src="https://cdn.staticfile.org/html5sortable/0.13.3/html5sortable.min.js" crossorigin="anonymous"></script>
             <script src="{% static 'js/sort_layout.js' %}"></script>
             {% endif %}
+
+            {{ layout|json_script:"layout-data" }} 
             <script>
-              const initialLayoutData = JSON.parse("{{ layout|escapejs }}");
+              const initialLayoutData = JSON.parse(document.getElementById('layout-data').textContent);
                             // initialize sort element visibility and order
               initialLayoutData.forEach(elem => {
-                                    // False to false, True to true
-                if (elem.visibility === "False") {
-                  elem.visibility = false;
-                } else {
-                  elem.visibility = true;
-                }
-                                    // set visiblity
+                // set visiblity
                 $('#' + elem.id).data('visibility', elem.visibility);
                 if (!elem.visibility) {
                   $('#' + elem.id).hide();
                 }
-                                    // order
+                // order
                 $('#' + elem.id).appendTo('.main-section-wrapper');
               });
             </script>
diff --git a/journal/views.py b/journal/views.py
index 0cc9583b..48001450 100644
--- a/journal/views.py
+++ b/journal/views.py
@@ -584,7 +584,6 @@ def profile(request, user_name):
     if user != request.user:
         liked_collections = liked_collections.filter(query_visible(request.user))
 
-    layout = user.get_preference().get_serialized_profile_layout()
     return render(
         request,
         "profile.html",
@@ -599,7 +598,7 @@ def profile(request, user_name):
                 for i in liked_collections.order_by("-edited_time")[:5]
             ],
             "liked_collections_count": liked_collections.count(),
-            "layout": layout,
+            "layout": user.get_preference().profile_layout,
             "reports": reports,
             "unread_announcements": unread_announcements,
         },
diff --git a/users/models.py b/users/models.py
index 7c429fbc..25aeb177 100644
--- a/users/models.py
+++ b/users/models.py
@@ -226,9 +226,6 @@ class Preference(models.Model):
     show_last_edit = models.PositiveSmallIntegerField(default=0)
     no_anonymous_view = models.PositiveSmallIntegerField(default=0)
 
-    def get_serialized_profile_layout(self):
-        return str(self.profile_layout).replace("'", '"')
-
     def __str__(self):
         return str(self.user)