Fix merge error
This commit is contained in:
parent
3bd3820519
commit
15bc4d4268
|
@ -96,8 +96,8 @@ module ApplicationHelper
|
|||
((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil
|
||||
end
|
||||
|
||||
def process_page(page, id)
|
||||
parse_page_noko(page, id)
|
||||
def process_page(page, id, params)
|
||||
parse_page_noko(page, id, params)
|
||||
end
|
||||
|
||||
def page_metas(page)
|
||||
|
|
Loading…
Reference in New Issue