Allow users to search by serial number

drapergeek · Feb 19, 2014 · 784dcda · 784dcda
1 parent cbd74f3
commit 784dcda
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/assets/javascripts/controllers/items_controller.js.coffee b/app/assets/javascripts/controllers/items_controller.js.coffee
@@ -16,7 +16,8 @@ Findit.ItemsController = Ember.ArrayController.extend
     @_itemMatches(item, 'name', search) ||
       @_itemMatches(item, 'make', search) ||
       @_itemMatches(item, 'model', search) ||
-      @_itemMatches(item, 'shortLocation', search)
+      @_itemMatches(item, 'shortLocation', search) ||
+      @_itemMatches(item, 'serial', search)
 
   _itemMatches: (item, propertyName, search) ->
     property = item.get(propertyName)?.toUpperCase()

diff --git a/app/assets/javascripts/models/item.js.coffee b/app/assets/javascripts/models/item.js.coffee
@@ -5,6 +5,7 @@ Findit.Item = DS.Model.extend
   shortType: DS.attr('string')
   typeOfItem: DS.attr('string')
   shortLocation: DS.attr('string')
+  serial: DS.attr('string')
 
   makeModel: (->
     make = @get('make')

diff --git a/app/serializers/item_serializer.rb b/app/serializers/item_serializer.rb
@@ -1,3 +1,3 @@
 class ItemSerializer < ActiveModel::Serializer
-  attributes :id, :name, :make, :model, :short_type, :location_id, :short_location
+  attributes :id, :name, :make, :model, :short_type, :location_id, :short_location, :serial
 end