developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ntu' of https://github.com/Rulingcom/orbit into ntu 

* 'ntu' of https://github.com/Rulingcom/orbit:
  fix disappear widget inter block
  make longer devise timeout
This commit is contained in:
Rueshyna 2012-12-27 15:28:01 +08:00
parent 9e07794cbc 2901b8e30c
commit 4db057e971
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/models/page.rb
View File

@ -31,13 +31,14 @@ class Page < Item
protected protected
def create_parts def create_parts
page_design = self.design page_design = self.design
parent = self.parent parent = self.parent
menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent menu_part = parent.page_parts.detect{|page_part| page_part.kind.eql?('public_r_tag') && page_part.public_r_tag.eql?('sub_menu') && page_part.public_r_tag_object_id.eql?(parent.id.to_s)} if parent
page_design.layout.layout_parts.each do |layout_part| page_design.layout.layout_parts.each do |layout_part|
current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)} current_part = self.page_parts.detect{|page_part| page_part.name.eql?(layout_part.name)}
current_part = self.page_parts.build(:name => layout_part.name) unless current_part current_part = self.page_parts.build(:name => layout_part.name) unless current_part
if menu_part && current_part.name.eql?(menu_part.name) if current_part.name.eql?(menu_part.name) && menu_part
if current_part.new_record? if current_part.new_record?
current_part.kind = menu_part.kind current_part.kind = menu_part.kind
current_part.public_r_tag = menu_part.public_r_tag current_part.public_r_tag = menu_part.public_r_tag
@ -50,6 +51,10 @@ class Page < Item
current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id) current_part.update_attributes(:kind => menu_part.kind, :public_r_tag => menu_part.public_r_tag, :public_r_tag_object_id => menu_part.public_r_tag_object_id)
end end
end end
else
if current_part.new_record?
current_part.save
end
end end
end end
end end

2
config/initializers/devise.rb
View File

@ -80,7 +80,7 @@ Devise.setup do |config|
# The time you want to timeout the user session without activity. After this # The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again. # time the user will be asked for credentials again.
# config.timeout_in = 10.minutes # config.timeout_in = 10.minutes
config.timeout_in = 10.minutes config.timeout_in = 5.days
# ==> Configuration for :lockable # ==> Configuration for :lockable
# Defines which strategy will be used to lock an account. # Defines which strategy will be used to lock an account.