Merge pull request #46 from spacemunkay/denney-fix-search

Fixing search form for bikes updated to netzke 8.4

Gemfile.lock

@@ -122,13 +122,13 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.22)
-    multi_json (1.7.2)
+    multi_json (1.7.9)
-    netzke-basepack (0.8.2)
+    netzke-basepack (0.8.4)
       netzke-core (~> 0.8.2)
     netzke-cancan (0.8.2)
       cancan
       netzke-core
-    netzke-core (0.8.3)
+    netzke-core (0.8.4)
       execjs
       uglifier
     nokogiri (1.5.9)
@@ -208,7 +208,7 @@ GEM
       railties (>= 3.1)
       therubyracer (~> 0.10.1)
     tzinfo (0.3.37)
-    uglifier (1.3.0)
+    uglifier (2.1.2)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     warden (1.1.1)

db/migrate/20130816015219_bike_condition_id_to_int.rb

@@ -0,0 +1,15 @@
+class BikeConditionIdToInt < ActiveRecord::Migration
+  def up
+    #for Postgres
+    connection.execute(%q{
+      alter table bikes
+      alter column bike_condition_id
+      type integer using cast(bike_condition_id as integer)
+    })
+  end
+
+  def down
+    #you really don't want to go back
+    change_column :bikes, :bike_condition_id, :string
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130629152047) do
+ActiveRecord::Schema.define(:version => 20130816015219) do
 
   create_table "bike_actions", :force => true do |t|
     t.string   "action",     :limit => 128, :null => false
@@ -56,7 +56,7 @@ ActiveRecord::Schema.define(:version => 20130629152047) do
     t.float    "top_tube_length"
     t.integer  "wheel_size"
     t.float    "value"
-    t.string   "bike_condition_id", :null => false
+    t.integer  "bike_condition_id", :null => false
     t.integer  "bike_status_id",    :null => false
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false