fixes library_id problem

pulibrary · Jun 14, 2016 · d51470a · d51470a
1 parent a4d5b91
commit d51470a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/models/locations/floor.rb b/app/models/locations/floor.rb
@@ -3,7 +3,5 @@ class Floor < ActiveRecord::Base
     include Locations::Labeled
     include Locations::WithLibrary
 
-    belongs_to :holding_library, class_name: 'Locations::Library', foreign_key: :holding_library_id
-
   end
 end
diff --git a/app/views/locations/floors/_form.html.erb b/app/views/locations/floors/_form.html.erb
@@ -27,6 +27,14 @@
     <%= f.label :walkable_areas %><br>
     <%= f.text_field :walkable_areas %>
   </div>
+
+  <div class="form-group">
+    <%= f.label 'Library', class: 'col-sm-2 control-label'%>
+    <div class="col-sm-10">
+      <%= f.collection_select :locations_library_id, Locations::Library.all, :id, :label, {prompt: "Select a Library"}, {class: "form-control"} %>
+    </div>
+  </div>
+
   <div class="actions">
     <%= f.submit %>
   </div>

diff --git a/db/migrate/20160614154022_add_locations_library_to_locations_floors.rb b/db/migrate/20160614154022_add_locations_library_to_locations_floors.rb
@@ -1,5 +1,5 @@
 class AddLocationsLibraryToLocationsFloors < ActiveRecord::Migration
   def change
-    add_reference :locations_floors, :locations_libraries, index: true, foreign_key: true
+    add_reference :locations_floors, :locations_library, index: true, foreign_key: true
   end
 end