diff --git a/app/controllers/pool_elements_controller.rb b/app/controllers/pool_elements_controller.rb index 0be0fc3b8..a2480bcf0 100644 --- a/app/controllers/pool_elements_controller.rb +++ b/app/controllers/pool_elements_controller.rb @@ -19,10 +19,4 @@ class PoolElementsController < ApplicationController @pool.remove!(@post) respond_with(@pool, :location => post_path(@post)) end - - def all_select - @pools = Pool.undeleted.order("name").select("id, name") - @pools.each # hack to force rails to eager load - @pools - end end diff --git a/app/views/pool_elements/_new.html.erb b/app/views/pool_elements/_new.html.erb index 205e03b3a..59a355121 100644 --- a/app/views/pool_elements/_new.html.erb +++ b/app/views/pool_elements/_new.html.erb @@ -4,7 +4,6 @@
<%= text_field_tag "pool_name", "", :size => 20, :data => { autocomplete: "pool" } %> - Search for a pool containing (<%= link_to "see full list", all_select_pool_element_path, :remote => true %>)
diff --git a/app/views/pool_elements/all_select.js.erb b/app/views/pool_elements/all_select.js.erb deleted file mode 100644 index 4c0232744..000000000 --- a/app/views/pool_elements/all_select.js.erb +++ /dev/null @@ -1,2 +0,0 @@ -$("#pool-name-container").html(<%= raw select_tag("pool_id", options_for_select(@pools.map {|x| [x.name, x.id]})).to_json %>); -$("#pool-name-hint").hide(); diff --git a/config/routes.rb b/config/routes.rb index 03ebe37c9..606eae540 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -182,11 +182,7 @@ Rails.application.routes.draw do end resource :order, :only => [:edit], :controller => "pool_orders" end - resource :pool_element, :only => [:create, :destroy] do - collection do - get :all_select - end - end + resource :pool_element, :only => [:create, :destroy] resources :pool_versions, :only => [:index] do member do get :diff