Merge branch 'master' of github.com:Rulingcom/NCCU
This commit is contained in:
commit
b3a9a7ab07
10 files changed
+295
-440
No files matched your search
@@ -16,6 +16,6 @@ end
|
||||
|
||||
# FileUtils.mv(temp_file, File.join(Rails.root, 'public/static', 'nccu_calendar.xml'))
|
||||
|
||||
puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced"
|
||||
puts "[#{ DateTime.now.strftime("%Y %D %H:%M")}]NccuCalendar Synced #{File.join(Rails.root, 'public/static', 'nccu_calendar.xml')}"
|
||||
end
|
||||
end
|
||||
+1
-1
@@ -25,7 +25,7 @@ class Page < Item
|
||||
protected
|
||||
|
||||
def create_parts
|
||||
if self.new_record? || self.design.changed?
|
||||
if self.new_record? || self.design_id_changed?
|
||||
page_design = self.design
|
||||
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
|
||||
|
||||
Reference in new issue
Block a user