alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some update for page settings

This commit is contained in:
Harry Bomrah 2014-12-01 19:11:40 +08:00
parent ed36c3a48f
commit 4b13800007
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/pages_controller.rb
View File

@ -163,12 +163,16 @@ class PagesController < ApplicationController
} }
end end
else else
if !module_app.key.eql?("page_content")
categories = module_app.categories.collect do |cat| categories = module_app.categories.collect do |cat|
{ {
"title" => cat.title, "title" => cat.title,
"id" => cat.id.to_s "id" => cat.id.to_s
} }
end end
else
categories = []
end
end end
roles = roles.nil? ? [] : roles roles = roles.nil? ? [] : roles
@ -200,6 +204,9 @@ class PagesController < ApplicationController
@modules = ModuleApp.all.frontend_enabled @modules = ModuleApp.all.frontend_enabled
@module_app = ModuleApp.find_by_key(@page.module) rescue nil @module_app = ModuleApp.find_by_key(@page.module) rescue nil
@categories = @module_app.categories rescue [] @categories = @module_app.categories rescue []
if @module_app.key.eql?("page_content")
@categories = []
end
@tags = @module_app.tags rescue [] @tags = @module_app.tags rescue []
if @module_app.key.eql?("member") if @module_app.key.eql?("member")
@roles = Role.order_by(:_id=>'ASC').all.collect do |role| @roles = Role.order_by(:_id=>'ASC').all.collect do |role|