From f1e26dbe3c8d5b6fdb970e98de4d5490f9e4e63c Mon Sep 17 00:00:00 2001 From: Alban Peignier Date: Mon, 28 Aug 2017 00:30:17 +0200 Subject: Fixes ImportsController#collection. Refs #4273 --- app/controllers/imports_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb index de1975890..b1b34731b 100644 --- a/app/controllers/imports_controller.rb +++ b/app/controllers/imports_controller.rb @@ -44,7 +44,7 @@ class ImportsController < BreadcrumbController protected def collection - @q = parent.imports.search(params[:q]) + @q = parent.imports.where(type: "WorkbenchImport").search(params[:q]) if sort_column && sort_direction @imports ||= @q.result(distinct: true).order(sort_column + ' ' + sort_direction).paginate(page: params[:page], per_page: 10) @@ -62,10 +62,6 @@ class ImportsController < BreadcrumbController end end - def collection - @imports ||= WorkbenchImport.all - end - def import_params params.require(:import).permit( :name, -- cgit v1.2.3