Merge branch 'master' into pretty-emails

This commit is contained in:
Rob Harrington
2014-11-27 00:02:44 +11:00

View File

@@ -7,7 +7,7 @@ angular.module("ofn.admin").directive "ofnTaxonAutocomplete", (Taxons) ->
placeholder: "Category"
multiple: false
initSelection: (element, callback) ->
callback Taxons.findByID(scope.product.category)
callback Taxons.findByID(scope.product.category_id)
query: (query) ->
query.callback { results: Taxons.findByTerm(query.term) }
formatResult: (taxon) ->