aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/stop_areas_controller.rb4
-rw-r--r--db/migrate/20160909130810_add_index_to_stop_areas.rb5
-rw-r--r--db/schema.rb3
3 files changed, 9 insertions, 3 deletions
diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb
index 275066efa..b37709e84 100644
--- a/app/controllers/stop_areas_controller.rb
+++ b/app/controllers/stop_areas_controller.rb
@@ -51,7 +51,7 @@ class StopAreasController < BreadcrumbController
def index
request.format.kml? ? @per_page = nil : @per_page = 12
- @zip_codes = stop_area_referential.stop_areas.collect(&:zip_code).compact.uniq
+ @zip_codes = stop_area_referential.stop_areas.where("zip_code is NOT null").distinct.pluck(:zip_code)
index! do |format|
format.html {
if collection.out_of_bounds?
@@ -131,7 +131,7 @@ class StopAreasController < BreadcrumbController
@q = parent.present? ? parent.stop_areas.search(params[:q]) : referential.stop_areas.search(params[:q])
@stop_areas ||=
begin
- stop_areas = @q.result(:distinct => true).order(:name)
+ stop_areas = @q.result.order(:name)
stop_areas = stop_areas.paginate(:page => params[:page], :per_page => @per_page) if @per_page.present?
stop_areas
end
diff --git a/db/migrate/20160909130810_add_index_to_stop_areas.rb b/db/migrate/20160909130810_add_index_to_stop_areas.rb
new file mode 100644
index 000000000..e5d4d2f40
--- /dev/null
+++ b/db/migrate/20160909130810_add_index_to_stop_areas.rb
@@ -0,0 +1,5 @@
+class AddIndexToStopAreas < ActiveRecord::Migration
+ def change
+ add_index :stop_areas, :name
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 19eeab9e7..0e606fb3e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160909125235) do
+ActiveRecord::Schema.define(version: 20160909130810) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -504,6 +504,7 @@ ActiveRecord::Schema.define(version: 20160909125235) do
t.datetime "deleted_at"
end
+ add_index "stop_areas", ["name"], :name => "index_stop_areas_on_name"
add_index "stop_areas", ["objectid"], :name => "stop_areas_objectid_key", :unique => true
add_index "stop_areas", ["parent_id"], :name => "index_stop_areas_on_parent_id"
add_index "stop_areas", ["stop_area_referential_id"], :name => "index_stop_areas_on_stop_area_referential_id"