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

Merge branch 'settings_backend'

Browse Source
This commit is contained in:
Nweni
2017-06-01 17:14:57 +06:30
parent ad38a0a708 e200dcd438
commit 926c54c079
15 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/settings/set_menu_items_controller.rb
View File

@@ -4,7 +4,7 @@ class Settings::SetMenuItemsController < ApplicationController
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@settings_menu_items = @category.menu_items
@settings_menu_items = @category.menu_items.page(params[:page]).per(10)
end
# GET /settings/menu_items/1
@@ -15,6 +15,7 @@ class Settings::SetMenuItemsController < ApplicationController
# GET /settings/menu_items/new
def new
@settings_menu_item = MenuItem.new
@settings_menu_item.type = "SetMenuItem"
end
# GET /settings/menu_items/1/edit

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

@@ -4,7 +4,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
# GET /settings/menu_items
# GET /settings/menu_items.json
def index
@settings_menu_items = @category.menu_items
@settings_menu_items = @category.menu_items.page(params[:page]).per(10)
end
# GET /settings/menu_items/1