From 22d55e9305a7e2b3279ecbc963fe07bf9e7272f5 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 18 Jun 2021 08:12:59 +0200 Subject: [PATCH] Bugfix --- app/controllers/admin/menu_items_controller.rb | 2 +- app/models/menu_item.rb | 2 +- app/views/admin/cibles/_cible_place.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/menu_items_controller.rb b/app/controllers/admin/menu_items_controller.rb index 738c398..48091c6 100644 --- a/app/controllers/admin/menu_items_controller.rb +++ b/app/controllers/admin/menu_items_controller.rb @@ -99,7 +99,7 @@ class Admin::MenuItemsController < ApplicationController @menu_item= MenuItem.new(params.require(:menu_item).permit(:parent_id, :menu_id, :enabled, :visible, :slug, :name, :menu_content_type)) - content = content_type.constantize.new(params_content) + content = content_type.constantize.new(params_content.permit!) @menu_item.menu_content = content diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 51a0e9a..7956d2e 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -110,7 +110,7 @@ class MenuItem < ActiveRecord::Base before_create do if !position - top = MenuItem.find(:first, :conditions =>{ :parent_id => self.parent_id, :menu_id => self.menu_id}, :order => "position DESC") + top = MenuItem.where({ :parent_id => self.parent_id, :menu_id => self.menu_id}).order("position DESC").first if top self.position = top.position.to_i + 1 else diff --git a/app/views/admin/cibles/_cible_place.html.haml b/app/views/admin/cibles/_cible_place.html.haml index f2e53cb..2225e11 100644 --- a/app/views/admin/cibles/_cible_place.html.haml +++ b/app/views/admin/cibles/_cible_place.html.haml @@ -6,5 +6,5 @@ #cible_content %script - ="$('#cible_content').load('"+eval("cible_admin_#{@cible_type.tableize}_path(:i_cible_type => params[:i_cible_type], :i_cible_id => params[:i_cible_id],:manager => params[:manager])")+"');" + =raw "$('#cible_content').load('"+eval("cible_admin_#{@cible_type.tableize}_path(:i_cible_type => params[:i_cible_type], :i_cible_id => params[:i_cible_id],:manager => params[:manager])")+"');" \ No newline at end of file