Moving taxons into its own module, adding preferred shopfront taxon order to enterprise

This commit is contained in:
Rob Harrington
2014-12-18 16:50:47 +11:00
parent a38e27e504
commit f145a7ed65
12 changed files with 32 additions and 12 deletions

View File

@@ -1,3 +1,3 @@
angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown", "admin.products", "infinite-scroll"]).config ($httpProvider) ->
angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown", "admin.products", "admin.taxons", "infinite-scroll"]).config ($httpProvider) ->
$httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
$httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

View File

@@ -23,6 +23,7 @@
//= require ./products/products
//= require ./shipping_methods/shipping_methods
//= require ./side_menu/side_menu
//= require ./taxons/taxons
//= require ./utils/utils
//= require ./users/users
//= require textAngular.min.js

View File

@@ -1 +1 @@
angular.module("admin.enterprises", [
angular.module("admin.enterprises", [

View File

@@ -1,9 +1,10 @@
angular.module("ofn.admin").directive "ofnTaxonAutocomplete", (Taxons) ->
angular.module("admin.taxons").directive "ofnTaxonAutocomplete", (Taxons) ->
# Adapted from Spree's existing taxon autocompletion
scope: true
link: (scope,element,attrs) ->
multiple = scope.$eval attrs.multipleSelection
placeholder = attrs.placeholder
initalSelection = scope.$eval attrs.ngModel
setTimeout ->
element.select2
@@ -11,9 +12,9 @@ angular.module("ofn.admin").directive "ofnTaxonAutocomplete", (Taxons) ->
multiple: multiple
initSelection: (element, callback) ->
if multiple
callback Taxons.findByIDs(scope.product.category_id)
callback Taxons.findByIDs(initalSelection)
else
callback Taxons.findByID(scope.product.category_id)
callback Taxons.findByID(initalSelection)
query: (query) ->
query.callback { results: Taxons.findByTerm(query.term) }
formatResult: (taxon) ->

View File

@@ -1,4 +1,4 @@
angular.module("ofn.admin").factory "Taxons", (taxons, $filter) ->
angular.module("admin.taxons").factory "Taxons", (taxons, $filter) ->
new class Taxons
constructor: ->
@taxons = taxons

View File

@@ -0,0 +1 @@
angular.module("admin.taxons", [])