From 377b4a3755e54362bb3fad4f2e9776efc0f0defd Mon Sep 17 00:00:00 2001
From: luisramos0 <luisramos0@gmail.com>
Date: Fri, 6 Sep 2019 12:47:54 +0100
Subject: [PATCH] Do not add ng-controller if main_ng_ctrl_name is not set

---
 app/views/spree/layouts/admin.html.haml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/spree/layouts/admin.html.haml b/app/views/spree/layouts/admin.html.haml
index 2457053ae0..530b83bdb5 100644
--- a/app/views/spree/layouts/admin.html.haml
+++ b/app/views/spree/layouts/admin.html.haml
@@ -5,7 +5,11 @@
 
   %body.admin
     - if content_for?(:main_ng_app_name)
-      %div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe, "ng-controller" => yield(:main_ng_ctrl_name).strip.html_safe }
-        = render :partial => 'spree/layouts/admin_body'
+      - if content_for?(:main_ng_ctrl_name)
+        %div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe, "ng-controller" => yield(:main_ng_ctrl_name).strip.html_safe }
+          = render :partial => 'spree/layouts/admin_body'
+      - else
+        %div{ "ng-app" => yield(:main_ng_app_name).strip.html_safe }
+          = render :partial => 'spree/layouts/admin_body'
     - else
       = render :partial => 'spree/layouts/admin_body'