Fixes bugs in grants page (frontend & backend) (#8361)

Author: gdixon

app/assets/v2/js/grants/index.js

@@ -2,7 +2,25 @@ let grantsNumPages = '';
 let grantsHasNext = false;
 let numGrants = '';
 
-let toggleStyle;
+const toggleStyle = function(style) {
+  let banner;
+
+  if (style.bg) {
+    banner = `url("${style.bg }") center top / ${style.size || ''} ${style.color || ''} no-repeat`;
+  } else {
+    banner = `url("${ style.banner_image }") center  no-repeat`;
+  }
+  $('#grant-hero-img').css('background', banner);
+  if (style.background_image) {
+    $('#grant-background-image-mount-point').css('background-image', style.background_image);
+  }
+
+  if (style.inline_css) {
+    $('style').last().text(style.inline_css);
+  } else {
+    $('style').last().text('');
+  }
+};
 
 $(document).ready(() => {
   $('#sort_option').select2({
@@ -52,28 +70,7 @@ $(document).ready(() => {
 
   });
 
-  toggleStyle = function(style) {
-    let banner;
-
-    if (style.bg) {
-      banner = `url("${style.bg }") center top / ${style.size || ''} ${style.color || ''} no-repeat`;
-    } else {
-      banner = `url("${ style.banner_image }") center  no-repeat`;
-    }
-    $('#grant-hero-img').css('background', banner);
-    if (style.background_image) {
-      $('#grant-background-image-mount-point').css('background-image', style.background_image);
-    }
-
-    if (style.inline_css) {
-      $('style').last().text(style.inline_css);
-    } else {
-      $('style').last().text('');
-    }
-   
-  };
   toggleStyle(document.current_style);
-
 });
 
 Vue.component('grant-sidebar', {

app/grants/views.py

@@ -827,8 +827,8 @@ def get_bg(grant_type):
 def get_policy_state(policy, request):
     return {
         "url_pattern": policy.url_pattern,
-        "banner_image": request.build_absolute_uri(policy.banner_image.url) if policy.banner_image else None,
-        "background_image": request.build_absolute_uri(policy.background_image.url) if policy.background_image else None,
+        "banner_image": request.build_absolute_uri(policy.banner_image.url) if policy.banner_image else '',
+        "background_image": request.build_absolute_uri(policy.background_image.url) if policy.background_image else '',
         "inline_css": policy.inline_css
     }