git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflit

Browse Source
This commit is contained in:
Zin Lin Phyo
2017-08-28 18:22:32 +06:30
parent 1cbea173df 0369cd6646
commit 63d97cce26
26 changed files with 644 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/simple_menu_items_controller.rb
View File

@@ -79,7 +79,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
respond_to do |format|
if @settings_menu_item.save
menu_item = MenuItem.find(@settings_menu_item.id)
menu_item.update_attributes(item_options: params[:simple_menu_item][:item_options])
menu_item.update_attributes(item_attributes: params[:simple_menu_item][:item_attributes], item_options: params[:simple_menu_item][:item_options])
format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' }
format.json { render :show, status: :created, location: @settings_menu_item }