fixed conflict

2017-06-04 13:12:02 +06:30
parent fa34d1db8f 89cbb59e7c
commit aa295c3a12
23 changed files with 250 additions and 43 deletions
--- a/app/controllers/settings/set_menu_items_controller.rb
+++ b/app/controllers/settings/set_menu_items_controller.rb
@@ -6,12 +6,14 @@ class Settings::SetMenuItemsController < ApplicationController
  def index
    @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
  end
- 
+
  # GET /settings/menu_items/1
  # GET /settings/menu_items/1.json
  def show
    @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
+
    @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
+
  end

  # GET /settings/menu_items/new