From 96ff387d1fa571b924e4cf7307e455e254f5bfe0 Mon Sep 17 00:00:00 2001
From: Rafael Schouten <rafaelschouten@gmail.com>
Date: Wed, 22 Oct 2014 15:34:09 +1100
Subject: [PATCH] fix navigation check on submission

---
 .../controllers/enterprise_controller.js.coffee           | 8 ++++++--
 app/views/admin/enterprises/edit.html.haml                | 2 +-
 app/views/admin/enterprises/new.html.haml                 | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
index 0fa452a8d6..cfcf6319af 100644
--- a/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
@@ -1,11 +1,15 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, longDescription, Enterprise, PaymentMethods, ShippingMethods) ->
+  .controller "enterpriseCtrl", ($scope, longDescription, NavigationCheck, Enterprise, PaymentMethods, ShippingMethods) ->
     $scope.Enterprise = Enterprise.enterprise
     $scope.PaymentMethods = PaymentMethods.paymentMethods
     $scope.ShippingMethods = ShippingMethods.shippingMethods
+    $scope.navClear = NavigationCheck.clear
     # htmlVariable is used by textAngular wysiwyg for the long descrtiption.
     $scope.htmlVariable = longDescription
-    # Provide a callback for a warning message displayed when leaving the page.
+
+    # Provide a callback for generating warning messages displayed before leaving the page. This is passed in
+    # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
+    # and on all new uses of this contoller, and we might not want that .
     $scope.enterpriseNavCallback = ->
       "You are editing an enterprise!"
 
diff --git a/app/views/admin/enterprises/edit.html.haml b/app/views/admin/enterprises/edit.html.haml
index 6a8d48b24b..3c132bf5e2 100644
--- a/app/views/admin/enterprises/edit.html.haml
+++ b/app/views/admin/enterprises/edit.html.haml
@@ -4,7 +4,7 @@
   Editing:
   = @enterprise.name
 
-= form_for [main_app, :admin, @enterprise] do |f|
+= form_for [main_app, :admin, @enterprise], html: { "ng-app" => 'admin.enterprises', "ng-submit" => "navClear()", "ng-controller" => 'enterpriseCtrl' , "nav-check" => '', "nav-callback" => 'enterpriseNavCallback()' } do |f|
   = render 'ng_form', f: f
   .twelve.columns.alpha
     = render partial: 'spree/admin/shared/edit_resource_links'
diff --git a/app/views/admin/enterprises/new.html.haml b/app/views/admin/enterprises/new.html.haml
index 32f6ea0a8d..3df3551f47 100644
--- a/app/views/admin/enterprises/new.html.haml
+++ b/app/views/admin/enterprises/new.html.haml
@@ -3,7 +3,7 @@
 - content_for :page_title do
   New Enterprise
 
-= form_for [main_app, :admin, @enterprise] do |f|
-  = render partial: 'ng_form', :locals => { f: f }
+= form_for [main_app, :admin, @enterprise], html: { "ng-app" => 'admin.enterprises', "ng-submit" => "navClear()", "ng-controller" => 'enterpriseCtrl' , "nav-check" => '', "nav-callback" => 'enterpriseNavCallback()' } do |f|
+  = render 'ng_form', f: f
   .twelve.columns.alpha
     = render partial: 'spree/admin/shared/new_resource_links'