diff --git a/app/controllers/admin/curations_controller.rb b/app/controllers/admin/curations_controller.rb
index 0efa745..11621f4 100644
--- a/app/controllers/admin/curations_controller.rb
+++ b/app/controllers/admin/curations_controller.rb
@@ -342,9 +342,6 @@ class Admin::CurationsController < OrbitAdminController
bps[:is_hot] = bulletin.is_hot
bps[:is_hidden] = bulletin.is_hidden
end
- if !defined?(Calendar).nil?
- bps = update_calendar(bps,bulletin)
- end
bulletin.update_attributes(bps)
bulletin.update_user_id = current_user.id
bulletin.expirable_created_at = nil
diff --git a/app/controllers/curations_controller.rb b/app/controllers/curations_controller.rb
index e214eaf..89bea1c 100644
--- a/app/controllers/curations_controller.rb
+++ b/app/controllers/curations_controller.rb
@@ -97,8 +97,8 @@ class CurationsController < ApplicationController
}
end
locale = OrbitHelper.get_site_locale.to_s
- files = a.bulletin_files.to_fronted(locale)
- links = a.bulletin_links.map{|link| { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue []
+ files = a.curation_post_files.to_fronted(locale)
+ links = a.curation_post_links.map{|link| { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue []
author = tmp_enable_annc_dept ? annc_depts[a.annc_dept] : User.find(a.update_user_id).member_name rescue (User.find(a.update_user_id).member_profile.name rescue "")
desc = a.image_description
desc = (desc.blank? ? "curation image" : desc)
@@ -771,7 +771,7 @@ class CurationsController < ApplicationController
img_src = (announcement.image.url || DefaultImgSrc) if announcement.display_img?
img_description = announcement.image_description if (announcement.image_description.present?) && (announcement.display_img?)
show_comment_flag = announcement.open_comment_for_user(OrbitHelper.current_user)
- bulletin_carousel_images = announcement.bulletin_carousel_images.map{|image| {"src"=>image.file.url,"description"=>image.description.to_s,"description_text"=>image.description_text }}
+ bulletin_carousel_images = announcement.curation_post_carousel_images.map{|image| {"src"=>image.file.url,"description"=>image.description.to_s,"description_text"=>image.description_text }}
resume_btn_title = (I18n.locale.to_s =="zh_tw") ? "繼續播放" : "resume"
pause_btn_title = (I18n.locale.to_s =="zh_tw") ? "暫停播放" : "pause"
prev_btn_title = (I18n.locale.to_s =="zh_tw") ? "上一張" : "prev"
diff --git a/app/models/curation_post.rb b/app/models/curation_post.rb
index d4ea01c..c2193b8 100644
--- a/app/models/curation_post.rb
+++ b/app/models/curation_post.rb
@@ -10,6 +10,7 @@ class CurationPost
include Slug
require 'curation/cache'
include Curation::Cache
+ SECTION_TYPES = ["text", "universal_table"]
attr_accessor :org_tag_ids,:org_category_id
def tags=(ids)
self.org_tag_ids = self.tag_ids
@@ -92,9 +93,11 @@ class CurationPost
has_many :curation_post_files, :autosave => true, :dependent => :destroy
has_many :curation_post_comments, :autosave => true, :dependent => :destroy
has_many :curation_post_carousel_images, :autosave => true, :dependent => :destroy
+ has_many :curation_post_sections, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :curation_post_files, :allow_destroy => true
accepts_nested_attributes_for :curation_post_links, :allow_destroy => true
accepts_nested_attributes_for :curation_post_carousel_images, :allow_destroy => true
+ accepts_nested_attributes_for :curation_post_sections, :allow_destroy => true
before_destroy :destroy_email
diff --git a/app/models/curation_post_section.rb b/app/models/curation_post_section.rb
new file mode 100644
index 0000000..a3e648e
--- /dev/null
+++ b/app/models/curation_post_section.rb
@@ -0,0 +1,13 @@
+# encoding: utf-8
+class CurationPostSection
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ field :title, localize: true
+ field :section_type
+ field :text, localize: true
+ field :universal_table
+ field :table_entries, type: Array, default: []
+
+ belongs_to :curation_post
+end
diff --git a/app/models/curation_setting.rb b/app/models/curation_setting.rb
index 397fc04..3e4652a 100644
--- a/app/models/curation_setting.rb
+++ b/app/models/curation_setting.rb
@@ -1,4 +1,4 @@
-class CurationPostSetting
+class CurationSetting
include Mongoid::Document
include Mongoid::Timestamps
field :carousel_image_type, :type => Integer, :default => 0 # 0: carousel, 1: album
diff --git a/app/views/admin/announcements/edit.html.erb b/app/views/admin/announcements/edit.html.erb
deleted file mode 100644
index bf61125..0000000
--- a/app/views/admin/announcements/edit.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= form_for @bulletin, url: admin_announcement_path(@bulletin), html: {class: "form-horizontal main-forms previewable"} do |f| %>
-
-<% end %>
\ No newline at end of file
diff --git a/app/views/admin/announcements/new.html.erb b/app/views/admin/announcements/new.html.erb
deleted file mode 100644
index 9ecaab7..0000000
--- a/app/views/admin/announcements/new.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= form_for @bulletin, url: admin_announcements_path, html: {class: "form-horizontal main-forms previewable"} do |f| %>
-
-<% end %>
\ No newline at end of file
diff --git a/app/views/admin/announcements/_approval_modal.html.erb b/app/views/admin/curations/_approval_modal.html.erb
similarity index 97%
rename from app/views/admin/announcements/_approval_modal.html.erb
rename to app/views/admin/curations/_approval_modal.html.erb
index 2e49a8b..4839694 100644
--- a/app/views/admin/announcements/_approval_modal.html.erb
+++ b/app/views/admin/curations/_approval_modal.html.erb
@@ -93,7 +93,7 @@