From 3d78b375c62c431ceb712e8a5f201eb91e165848 Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Thu, 17 Mar 2016 15:24:08 +1100
Subject: [PATCH] Moving angularjs tag rule logic into its own module

---
 app/assets/javascripts/admin/all.js                         | 1 +
 .../javascripts/admin/enterprises/enterprises.js.coffee     | 2 +-
 .../controllers/tag_rules_controller.js.coffee              | 6 +++---
 .../directives/invert_number.js.coffee                      | 2 +-
 .../directives/tag_rules/discount_order.js.coffee           | 2 +-
 app/assets/javascripts/admin/tag_rules/tag_rules.js.coffee  | 1 +
 .../controllers/tag_rules_controller_spec.js.coffee         | 5 ++---
 7 files changed, 10 insertions(+), 9 deletions(-)
 rename app/assets/javascripts/admin/{enterprises => tag_rules}/controllers/tag_rules_controller.js.coffee (82%)
 rename app/assets/javascripts/admin/{enterprises => tag_rules}/directives/invert_number.js.coffee (83%)
 rename app/assets/javascripts/admin/{enterprises => tag_rules}/directives/tag_rules/discount_order.js.coffee (56%)
 create mode 100644 app/assets/javascripts/admin/tag_rules/tag_rules.js.coffee
 rename spec/javascripts/unit/admin/{enterprises => tag_rules}/controllers/tag_rules_controller_spec.js.coffee (95%)

diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 1e2b6f3898..9f99dc1dcd 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -38,6 +38,7 @@
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods
 //= require ./side_menu/side_menu
+//= require ./tag_rules/tag_rules
 //= require ./taxons/taxons
 //= require ./utils/utils
 //= require ./users/users
diff --git a/app/assets/javascripts/admin/enterprises/enterprises.js.coffee b/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
index 4adb31cf08..2074a1ea05 100644
--- a/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
+++ b/app/assets/javascripts/admin/enterprises/enterprises.js.coffee
@@ -1 +1 @@
-angular.module("admin.enterprises", [
  "admin.paymentMethods",
  "admin.utils",
  "admin.shippingMethods",
  "admin.users",
  "textAngular",
  "admin.side_menu",
  "admin.taxons",
  'admin.indexUtils',
  'admin.dropdown',
  'pasvaz.bindonce',
  'ngSanitize',
  'ngTagsInput']
)
\ No newline at end of file
+angular.module("admin.enterprises", [
  "admin.paymentMethods",
  "admin.utils",
  "admin.shippingMethods",
  "admin.users",
  "textAngular",
  "admin.side_menu",
  "admin.taxons",
  'admin.indexUtils',
  'admin.tagRules',
  'admin.dropdown',
  'pasvaz.bindonce',
  'ngSanitize']
)
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/enterprises/controllers/tag_rules_controller.js.coffee b/app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee
similarity index 82%
rename from app/assets/javascripts/admin/enterprises/controllers/tag_rules_controller.js.coffee
rename to app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee
index 096cce250d..7d8305118f 100644
--- a/app/assets/javascripts/admin/enterprises/controllers/tag_rules_controller.js.coffee
+++ b/app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee
@@ -1,5 +1,5 @@
-angular.module("admin.enterprises").controller "TagRulesCtrl", ($scope, $http) ->
-  $scope.tagGroups = $scope.Enterprise.tag_groups
+angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, enterprise) ->
+  $scope.tagGroups = enterprise.tag_groups
 
   updateRuleCounts = ->
     index = 0
@@ -35,7 +35,7 @@ angular.module("admin.enterprises").controller "TagRulesCtrl", ($scope, $http) -
       if confirm("Are you sure?")
         $http
           method: "DELETE"
-          url: "/admin/enterprises/#{$scope.Enterprise.id}/tag_rules/#{tagRule.id}.json"
+          url: "/admin/enterprises/#{enterprise.id}/tag_rules/#{tagRule.id}.json"
         .success ->
           tagGroup.rules.splice(index, 1)
           updateRuleCounts()
diff --git a/app/assets/javascripts/admin/enterprises/directives/invert_number.js.coffee b/app/assets/javascripts/admin/tag_rules/directives/invert_number.js.coffee
similarity index 83%
rename from app/assets/javascripts/admin/enterprises/directives/invert_number.js.coffee
rename to app/assets/javascripts/admin/tag_rules/directives/invert_number.js.coffee
index 0557d3ed22..2412eec18c 100644
--- a/app/assets/javascripts/admin/enterprises/directives/invert_number.js.coffee
+++ b/app/assets/javascripts/admin/tag_rules/directives/invert_number.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.enterprises").directive "invertNumber", ->
+angular.module("admin.tagRules").directive "invertNumber", ->
   restrict: "A"
   require: "ngModel"
   link: (scope, element, attrs, ngModel) ->
diff --git a/app/assets/javascripts/admin/enterprises/directives/tag_rules/discount_order.js.coffee b/app/assets/javascripts/admin/tag_rules/directives/tag_rules/discount_order.js.coffee
similarity index 56%
rename from app/assets/javascripts/admin/enterprises/directives/tag_rules/discount_order.js.coffee
rename to app/assets/javascripts/admin/tag_rules/directives/tag_rules/discount_order.js.coffee
index 079dd04dba..b374f88782 100644
--- a/app/assets/javascripts/admin/enterprises/directives/tag_rules/discount_order.js.coffee
+++ b/app/assets/javascripts/admin/tag_rules/directives/tag_rules/discount_order.js.coffee
@@ -1,4 +1,4 @@
-angular.module("admin.enterprises").directive "discountOrder", ->
+angular.module("admin.tagRules").directive "discountOrder", ->
   restrict: "E"
   replace: true
   templateUrl: "admin/tag_rules/discount_order.html"
diff --git a/app/assets/javascripts/admin/tag_rules/tag_rules.js.coffee b/app/assets/javascripts/admin/tag_rules/tag_rules.js.coffee
new file mode 100644
index 0000000000..88c7734c33
--- /dev/null
+++ b/app/assets/javascripts/admin/tag_rules/tag_rules.js.coffee
@@ -0,0 +1 @@
+angular.module("admin.tagRules", ['ngTagsInput'])
diff --git a/spec/javascripts/unit/admin/enterprises/controllers/tag_rules_controller_spec.js.coffee b/spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee
similarity index 95%
rename from spec/javascripts/unit/admin/enterprises/controllers/tag_rules_controller_spec.js.coffee
rename to spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee
index 988040694c..0b92822a0a 100644
--- a/spec/javascripts/unit/admin/enterprises/controllers/tag_rules_controller_spec.js.coffee
+++ b/spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee
@@ -4,7 +4,7 @@ describe "TagRulesCtrl", ->
   enterprise = null
 
   beforeEach ->
-    module('admin.enterprises')
+    module('admin.tagRules')
     enterprise =
       id: 45
       tag_groups: [
@@ -14,8 +14,7 @@ describe "TagRulesCtrl", ->
 
     inject ($rootScope, $controller) ->
       scope = $rootScope
-      scope.Enterprise = enterprise
-      ctrl = $controller 'TagRulesCtrl', {$scope: scope}
+      ctrl = $controller 'TagRulesCtrl', {$scope: scope, enterprise: enterprise}
 
   describe "tagGroup start indices", ->
     it "updates on initialization", ->