From fec7a18af3d164fea80d9ee772cf260851b5e79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Gaya?= <sebastien.gaya@gmail.com>
Date: Wed, 24 Nov 2021 10:27:06 +0100
Subject: [PATCH] fallback params ids
---
.../admin/communication/website/categories_controller.rb | 4 ++--
.../admin/communication/website/menu/items_controller.rb | 4 ++--
.../admin/communication/website/pages_controller.rb | 4 ++--
app/controllers/admin/education/programs_controller.rb | 4 ++--
app/controllers/concerns/admin/reorderable.rb | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/controllers/admin/communication/website/categories_controller.rb b/app/controllers/admin/communication/website/categories_controller.rb
index 15e7f5658..57de36eac 100644
--- a/app/controllers/admin/communication/website/categories_controller.rb
+++ b/app/controllers/admin/communication/website/categories_controller.rb
@@ -9,8 +9,8 @@ class Admin::Communication::Website::CategoriesController < Admin::Communication
end
def reorder
- parent_id = params['parentId'].blank? ? nil : params['parentId']
- ids = params['ids']
+ parent_id = params[:parentId].blank? ? nil : params[:parentId]
+ ids = params[:ids] || []
ids.each.with_index do |id, index|
category = @website.categories.find(id)
category.update(
diff --git a/app/controllers/admin/communication/website/menu/items_controller.rb b/app/controllers/admin/communication/website/menu/items_controller.rb
index 13dee32be..eb19f0bbb 100644
--- a/app/controllers/admin/communication/website/menu/items_controller.rb
+++ b/app/controllers/admin/communication/website/menu/items_controller.rb
@@ -3,8 +3,8 @@ class Admin::Communication::Website::Menu::ItemsController < Admin::Communicatio
load_and_authorize_resource class: Communication::Website::Menu::Item, through: :menu
def reorder
- parent_id = params['parentId'].blank? ? nil : params['parentId']
- ids = params['ids']
+ parent_id = params[:parentId].blank? ? nil : params[:parentId]
+ ids = params[:ids] || []
ids.each.with_index do |id, index|
category = @menu.items.find(id)
category.update(
diff --git a/app/controllers/admin/communication/website/pages_controller.rb b/app/controllers/admin/communication/website/pages_controller.rb
index 4371f769c..1bb615d53 100644
--- a/app/controllers/admin/communication/website/pages_controller.rb
+++ b/app/controllers/admin/communication/website/pages_controller.rb
@@ -8,8 +8,8 @@ class Admin::Communication::Website::PagesController < Admin::Communication::Web
end
def reorder
- parent_id = params['parentId'].blank? ? nil : params['parentId']
- ids = params['ids']
+ parent_id = params[:parentId].blank? ? nil : params[:parentId]
+ ids = params[:ids] || []
ids.each.with_index do |id, index|
page = @website.pages.find(id)
page.update(
diff --git a/app/controllers/admin/education/programs_controller.rb b/app/controllers/admin/education/programs_controller.rb
index 916ceae89..38d9e145c 100644
--- a/app/controllers/admin/education/programs_controller.rb
+++ b/app/controllers/admin/education/programs_controller.rb
@@ -7,8 +7,8 @@ class Admin::Education::ProgramsController < Admin::Education::ApplicationContro
end
def reorder
- parent_id = params['parentId'].blank? ? nil : params['parentId']
- ids = params['ids']
+ parent_id = params[:parentId].blank? ? nil : params[:parentId]
+ ids = params[:ids] || []
website_ids = []
ids.each.with_index do |id, index|
program = current_university.education_programs.find(id)
diff --git a/app/controllers/concerns/admin/reorderable.rb b/app/controllers/concerns/admin/reorderable.rb
index 2ce07bf58..949be51e3 100644
--- a/app/controllers/concerns/admin/reorderable.rb
+++ b/app/controllers/concerns/admin/reorderable.rb
@@ -3,7 +3,7 @@ module Admin::Reorderable
included do
def reorder
- ids = params[:ids]
+ ids = params[:ids] || []
ids.each.with_index do |id, index|
object = model.find_by(id: id)
object.update_column(:position, index + 1) unless object.nil?
--
GitLab