From b4e49b68b13961661d3a55d22ccdc7e87eb6e95a Mon Sep 17 00:00:00 2001
From: Alex Tharp <toastercup@gmail.com>
Date: Mon, 10 Jul 2017 14:54:46 -0500
Subject: [PATCH] fix(Legacy Webpages): implement appendEditingModeToUrl so
 that ng-src doesn't append two '?' characters to URLs that already have
 params, which was triggering a redirect

---
 .../javascripts/legacy/controllers/webpages/edit.js  | 12 ++++++++++++
 app/assets/legacy_templates/webpages/edit.html       |  4 ++--
 db/schema.rb                                         |  2 +-
 db/seeds.rb                                          |  4 +---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/legacy/controllers/webpages/edit.js b/app/assets/javascripts/legacy/controllers/webpages/edit.js
index 2a5575adf..47b2a5fb4 100644
--- a/app/assets/javascripts/legacy/controllers/webpages/edit.js
+++ b/app/assets/javascripts/legacy/controllers/webpages/edit.js
@@ -72,4 +72,16 @@ angular.module('cortex.controllers.webpages.edit', [
         page: page.page
       });
     }
+
+    $scope.appendEditingModeToUrl = function(url) {
+      var urlHasParams = _.includes(url, '?');
+
+      if (urlHasParams) {
+        url = url + '&editing_mode=1';
+      } else {
+        url = url + '?editing_mode=1';
+      }
+
+      return url;
+    }
   });
diff --git a/app/assets/legacy_templates/webpages/edit.html b/app/assets/legacy_templates/webpages/edit.html
index 97d86b6d8..e5e8208b0 100644
--- a/app/assets/legacy_templates/webpages/edit.html
+++ b/app/assets/legacy_templates/webpages/edit.html
@@ -129,6 +129,6 @@
     </tab>
   </tabset>
 
-  <iframe class="webpage-frame" id="webpage-frame"
-          ng-src="{{ data.webpage.url + '?editing_mode=1' | trustAsResourceUrl }}" disabled></iframe>
+  <iframe ng-if="data.webpage.url" class="webpage-frame" id="webpage-frame"
+          ng-src="{{ appendEditingModeToUrl(data.webpage.url) | trustAsResourceUrl }}" disabled></iframe>
 </div>
diff --git a/db/schema.rb b/db/schema.rb
index e0da3f489..a7efa7be7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -472,8 +472,8 @@
     t.string   "dynamic_yield_sku"
     t.string   "dynamic_yield_category"
     t.jsonb    "tables_widget"
-    t.jsonb    "accordion_group_widget"
     t.jsonb    "charts_widget"
+    t.jsonb    "accordion_group_widget"
     t.index ["user_id"], name: "index_webpages_on_user_id", using: :btree
   end
 
diff --git a/db/seeds.rb b/db/seeds.rb
index e5d17cd1c..623bf11e5 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -12,9 +12,7 @@
                                                                             job_phase: initial_post_seed.job_phase,
                                                                             display: initial_post_seed.display,
                                                                             copyright_owner: initial_post_seed.copyright_owner,
-                                                                            categories: [Category.first],
-                                                                            primary_category: Category.first,
-                                                                            author: User.first)
+                                                                            author: Author.first)
 
 existing_tenant = Tenant.find_by_name(tenant_seed.name)