diff options
| author | Alban Peignier | 2017-08-28 00:30:17 +0200 |
|---|---|---|
| committer | Alban Peignier | 2017-08-28 00:30:17 +0200 |
| commit | f1e26dbe3c8d5b6fdb970e98de4d5490f9e4e63c (patch) | |
| tree | a861a48a8e2d59b4e1f06fc43cac989f0c4ec2ce | |
| parent | d01ec772b1e65e5d00f56bcd288bf710d1b55712 (diff) | |
| download | chouette-core-f1e26dbe3c8d5b6fdb970e98de4d5490f9e4e63c.tar.bz2 | |
Fixes ImportsController#collection. Refs #4273
| -rw-r--r-- | app/controllers/imports_controller.rb | 6 |
1 files changed, 1 insertions, 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, |