aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/imports_controller.rb
diff options
context:
space:
mode:
authorLuc Donnet2017-09-27 09:56:59 +0200
committerLuc Donnet2017-09-27 09:56:59 +0200
commit16fc6a184311c0ab5e1463398b91f8a716bcf4db (patch)
treeeea2b4b703c6e7960077a0ad1f1b61e079822950 /app/controllers/imports_controller.rb
parent7ec5867ec7bd7365bb4c97d7d4c1bdc2cf580bc2 (diff)
parent28a42fb19174eafee38fe3c5f8fa58f89991f44a (diff)
downloadchouette-core-16fc6a184311c0ab5e1463398b91f8a716bcf4db.tar.bz2
Merge branch 'master' of github.com:AF83/stif-boiv
Diffstat (limited to 'app/controllers/imports_controller.rb')
-rw-r--r--app/controllers/imports_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/imports_controller.rb b/app/controllers/imports_controller.rb
index fa8919f20..f2e65e445 100644
--- a/app/controllers/imports_controller.rb
+++ b/app/controllers/imports_controller.rb
@@ -1,4 +1,5 @@
class ImportsController < BreadcrumbController
+ include PolicyChecker
skip_before_action :authenticate_user!, only: [:download]
defaults resource_class: Import, collection_name: 'imports', instance_name: 'import'
before_action :ransack_started_at_params, only: [:index]
@@ -89,7 +90,6 @@ class ImportsController < BreadcrumbController
def ransack_status_params
if params[:q]
- binding.pry
return params[:q].delete(:status_eq_any) if params[:q][:status_eq_any].empty? || ( (Import.status.values & params[:q][:status_eq_any]).length >= 4 )
params[:q][:status_eq_any].push("new", "running") if params[:q][:status_eq_any].include?("pending")
params[:q][:status_eq_any].push("aborted", "canceled") if params[:q][:status_eq_any].include?("failed")