diff --git a/app/controllers/admin/curations_controller.rb b/app/controllers/admin/curations_controller.rb
index 450e4d2..0efa745 100644
--- a/app/controllers/admin/curations_controller.rb
+++ b/app/controllers/admin/curations_controller.rb
@@ -281,7 +281,7 @@ class Admin::CurationsController < OrbitAdminController
bulletin.notify_feed("create")
end
#BulletinFeed.create_feed_cache(bulletin)
- redirect_to admin_announcements_path
+ redirect_to admin_curations_path
end
def approve_bulletin
@@ -493,7 +493,7 @@ class Admin::CurationsController < OrbitAdminController
:mail_lang => locale,
:mail_to=>bulletin.email_addresses,
:mail_subject=>title,
- :template=>'announcements/email',
+ :template=>'curation/email',
:template_data=>{
"host" => request.host_with_port,
"title" => title,
diff --git a/app/controllers/curation_posts_controller.rb b/app/controllers/curation_posts_controller.rb
index c10cef8..67a0104 100644
--- a/app/controllers/curation_posts_controller.rb
+++ b/app/controllers/curation_posts_controller.rb
@@ -3,20 +3,20 @@ class CurationPostsController < ApplicationController
before_filter :set_I18n
def annc_depts_translations
if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash
- OrbitHelper::SharedHash['announcement'][:annc_depts_translations] rescue AnnouncementSetting.first.annc_depts_translations
+ OrbitHelper::SharedHash['curation'][:annc_depts_translations] rescue CurationSetting.first.annc_depts_translations
else
- AnnouncementSetting.first.annc_depts_translations rescue {}
+ CurationSetting.first.annc_depts_translations rescue {}
end
end
def enable_annc_dept
if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash
- OrbitHelper::SharedHash['announcement'][:enable_annc_dept] rescue AnnouncementSetting.first.enable_annc_dept
+ OrbitHelper::SharedHash['curation'][:enable_annc_dept] rescue CurationSetting.first.enable_annc_dept
else
- AnnouncementSetting.first.enable_annc_dept rescue false
+ CurationSetting.first.enable_annc_dept rescue false
end
end
def get_bulletins
- page = Page.where(:module => "announcement").first rescue nil
+ page = Page.where(:module => "curation").first rescue nil
# 頁次
page_num = params[:page_num].blank? ? 0 : params[:page_num].to_i
@@ -32,13 +32,13 @@ class CurationPostsController < ApplicationController
keyword = params[:keyword].to_s
if keyword.present?
keyword_regex = OrbitHelper.get_keyword_regex(keyword)
- bulletins = Bulletin.any_of({:title=>keyword_regex},{:subtitle=>keyword_regex},{:text=>keyword_regex})
+ bulletins = CurationPost.any_of({:title=>keyword_regex},{:subtitle=>keyword_regex},{:text=>keyword_regex})
else
- bulletins = Bulletin.all
+ bulletins = CurationPost.all
end
if !params[:category].blank?
- module_id = ModuleApp.where(:key=>"announcement").first.id
+ module_id = ModuleApp.where(:key=>"curation").first.id
category = Regexp.new(".*"+params[:category]+".*")
category_id = Category.where(:title => category, :module_app_id => module_id).first.id
bulletins = bulletins.where(:category_id => category_id)
@@ -49,7 +49,7 @@ class CurationPostsController < ApplicationController
bulletins = bulletins.where(:is_preview.in=>[false,nil])
bulletins = bulletins.where(:approved.ne => false , :rejected.ne => true)
bulletins = bulletins.where(:postdate.lt=>Time.now)
- if (AnnouncementsHelper.enable_manually_sort rescue false)
+ if (CurationsHelper.enable_manually_sort rescue false)
bulletins = bulletins.order({:is_top => -1, :sort_number => 1, :postdate => -1}).page(page_num).per(per_page)
else
bulletins = bulletins.desc( :is_top, :postdate).page(page_num).per(per_page)
@@ -58,14 +58,14 @@ class CurationPostsController < ApplicationController
bulletins = bulletins.collect do |b|
image = request.protocol + request.host_with_port + b.image.url rescue nil
- links = b.bulletin_links.collect do |bl|
+ links = b.curation_post_links.collect do |bl|
{
"title" => bl.title_translations,
"url" => bl.url
}
end rescue nil
- files = b.bulletin_files.collect do |bf|
+ files = b.curation_post_files.collect do |bf|
file = request.protocol + request.host_with_port + bf.file.url rescue nil
{
"title" => bf.title_translations,
@@ -107,9 +107,9 @@ class CurationPostsController < ApplicationController
# 計算總筆數 Start
if keyword.present?
keyword_regex = OrbitHelper.get_keyword_regex(keyword)
- bulletin_count = Bulletin.any_of({:title=>keyword_regex},{:subtitle=>keyword_regex},{:text=>keyword_regex})
+ bulletin_count = CurationPost.any_of({:title=>keyword_regex},{:subtitle=>keyword_regex},{:text=>keyword_regex})
else
- bulletin_count = Bulletin.all
+ bulletin_count = CurationPost.all
end
bulletin_count = bulletin_count.where(:is_preview.in=>[false,nil])
bulletin_count = bulletin_count.where(:approved.ne => false , :rejected.ne => true)
diff --git a/app/controllers/curations_controller.rb b/app/controllers/curations_controller.rb
index fd53a34..e214eaf 100644
--- a/app/controllers/curations_controller.rb
+++ b/app/controllers/curations_controller.rb
@@ -4,35 +4,35 @@ class CurationsController < ApplicationController
DefaultImgSrc = "/assets/announcement-default.jpg\" onerror=\"this.src="/assets/announcement-default-2.jpg";this.onerror='';"
def initialize
super
- @app_title = 'announcement'
+ @app_title = 'curation'
#self.request = OrbitHelper.request
end
def annc_depts_translations
if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash
- OrbitHelper::SharedHash['announcement'][:annc_depts_translations] rescue AnnouncementSetting.first.annc_depts_translations
+ OrbitHelper::SharedHash['curation'][:annc_depts_translations] rescue CurationSetting.first.annc_depts_translations
else
- AnnouncementSetting.first.annc_depts_translations rescue {}
+ CurationSetting.first.annc_depts_translations rescue {}
end
end
def enable_annc_dept
if defined?(OrbitHelper::SharedHash) && OrbitHelper::SharedHash
- OrbitHelper::SharedHash['announcement'][:enable_annc_dept] rescue AnnouncementSetting.first.enable_annc_dept
+ OrbitHelper::SharedHash['curation'][:enable_annc_dept] rescue CurationSetting.first.enable_annc_dept
else
- AnnouncementSetting.first.enable_annc_dept rescue false
+ CurationSetting.first.enable_annc_dept rescue false
end
end
def render_400
- render(:file => "#{ViewRootDir}/announcements/400.html", :layout => false, :status => 400, :formats => [:html])
+ render(:file => "#{ViewRootDir}/curations/400.html", :layout => false, :status => 400, :formats => [:html])
end
def render_404
render(:file => "#{Rails.root}/app/views/errors/404.html", :layout => false, :status => 404, :formats => [:html])
end
def comment
- @bulletin = Bulletin.where(:uid=>params[:uid]).first
+ @bulletin = CurationPost.where(:uid=>params[:uid]).first
comment_val = params['comment']
if !@bulletin.nil? && @bulletin.open_comment_for_user(OrbitHelper.current_user) && !comment_val.blank?
account_id = OrbitHelper.current_user.member_profile.id.to_s rescue 'visitor'
- b = BulletinComment.new(ip: request.remote_ip,comment: comment_val,account_id: account_id)
+ b = CurationPostComment.new(ip: request.remote_ip,comment: comment_val,account_id: account_id)
b.bulletin_id = @bulletin.id
b.save
render :json => {}
@@ -42,13 +42,13 @@ class CurationsController < ApplicationController
end
def index
@type = 'index'
- Bulletin.remove_expired_status
+ CurationPost.remove_expired_status
params = @params = OrbitHelper.params
page = @page || Page.where(url: params['url']).first
@enable_search_flag = false
@image_version = 'thumb'
if page.respond_to?(:select_option_items)
- module_app = ModuleApp.where(key: 'announcement').first
+ module_app = ModuleApp.where(key: 'curation').first
@show_option_items = nil
if module_app && page.respond_to?(:select_option_items)
@show_option_items = module_app.show_option_items
@@ -59,17 +59,17 @@ class CurationsController < ApplicationController
case select_option_item.field_name
when @show_option_items.keys[1].to_s
value = YAML.load(select_option_item.value)
- if value[:en] == t('announcement.yes')
+ if value[:en] == t('curation.yes')
@enable_search_flag = true
end
when @show_option_items.keys[2].to_s
value = YAML.load(select_option_item.value)
tmp = value[:en]
- if tmp == t('announcement.small_size')
+ if tmp == t('curation.small_size')
@image_version = 'thumb'
- elsif tmp == t('announcement.medium_size')
+ elsif tmp == t('curation.medium_size')
@image_version = 'mobile'
- elsif tmp == t('announcement.orignal_size')
+ elsif tmp == t('curation.orignal_size')
@image_version = 'orignal'
end
end
@@ -101,7 +101,7 @@ class CurationsController < ApplicationController
links = a.bulletin_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? ? "announcement image" : desc)
+ desc = (desc.blank? ? "curation image" : desc)
link_to_show = a.is_external_link ? a.external_link : OrbitHelper.url_to_show(a.to_param)
target = a.is_external_link ? "_blank" : "_self"
title = a.title_plain_text
@@ -131,7 +131,7 @@ class CurationsController < ApplicationController
"target" => target,
"img_src" => image_url || DefaultImgSrc,
"img_description" => desc,
- "more" => t("announcement.more"),
+ "more" => t("curation.more"),
"view_count" => a.view_count
}
else
@@ -158,19 +158,19 @@ class CurationsController < ApplicationController
{
"announcements" => anns,
"extras" => {
- "widget-title" =>t('announcement.announcement'),
- "title-head" => t('announcement.table.title'),
- "date-head" => t('announcement.table.date'),
- "status-head" => t('announcement.table.status'),
- "author-head" => t('announcement.table.author'),
- "subtitle-head" => t('announcement.table.sub_title'),
- "category-head" => t('announcement.table.category'),
- "link-head" => t('announcement.table.link'),
- "file-head" => t('announcement.table.file'),
- "view-count-head" => t('announcement.table.view_count'),
+ "widget-title" =>t('curation.curation'),
+ "title-head" => t('curation.table.title'),
+ "date-head" => t('curation.table.date'),
+ "status-head" => t('curation.table.status'),
+ "author-head" => t('curation.table.author'),
+ "subtitle-head" => t('curation.table.sub_title'),
+ "category-head" => t('curation.table.category'),
+ "link-head" => t('curation.table.link'),
+ "file-head" => t('curation.table.file'),
+ "view-count-head" => t('curation.table.view_count'),
"display" => display,
- "department-head" => t('announcement.table.department'),
- "annc-dept-head" => t("announcement.annc_dept"),
+ "department-head" => t('curation.table.department'),
+ "annc-dept-head" => t("curation.annc_dept"),
"page-title" => @annc_page_title
},
"total_pages" => total_pages
@@ -187,7 +187,7 @@ class CurationsController < ApplicationController
end
def tag_cloud
- ma = ModuleApp.where(:key => "announcement").first
+ ma = ModuleApp.where(:key => "curation").first
temp = []
ma.tags.each do |tag|
t1 = tag.taggings.collect{|t| t.taggable_id.to_s}
@@ -281,10 +281,10 @@ class CurationsController < ApplicationController
page = nil
if home_page.respond_to?(:find_page)
page = home_page.find_page(:page_id=> subpart.read_more_page_id,:enabled_for=>locale).first rescue nil
- page = home_page.find_page(:module=>"announcement",:enabled_for=>locale).first rescue nil if page.nil?
+ page = home_page.find_page(:module=>"curation",:enabled_for=>locale).first rescue nil if page.nil?
else
page = Page.where(:page_id=> subpart.read_more_page_id,:enabled_for=>locale).first rescue nil
- page = Page.where(:module=>"announcement",:enabled_for=>locale).first rescue nil if page.nil?
+ page = Page.where(:module=>"curation",:enabled_for=>locale).first rescue nil if page.nil?
end
page_url = "/#{locale}#{(page.get_url rescue page.url)}"
end
@@ -306,10 +306,10 @@ class CurationsController < ApplicationController
(use_tag ? tags.map.with_index{|tag,i|
read_more_url = "#{page_url}" rescue ""
read_more_url = read_more_url + "?" + {"category"=>all_cats,"tags"=>(tag == 'all' ? all_tags : [tag])}.to_param if read_more_url != ""
- read_more_text = I18n.t("announcement.more")
+ read_more_text = I18n.t("curation.more")
if tag != "all"
begin
- read_more_text = I18n.t("announcement.more_") + tags_translations[tag]
+ read_more_text = I18n.t("curation.more_") + tags_translations[tag]
rescue
nil
end
@@ -318,10 +318,10 @@ class CurationsController < ApplicationController
}.join("") : cats.map.with_index{|cat,i|
read_more_url = "#{page_url}" rescue ""
read_more_url = read_more_url + "?" + {"category"=>(cat == 'all' ? all_cats : cat)}.to_param if read_more_url != ""
- read_more_text = I18n.t("announcement.more")
+ read_more_text = I18n.t("curation.more")
if cat != "all"
begin
- read_more_text = I18n.t("announcement.more_") + cats_translations[cat]
+ read_more_text = I18n.t("curation.more_") + cats_translations[cat]
rescue
nil
end
@@ -399,10 +399,10 @@ class CurationsController < ApplicationController
'
else
- read_more_text = I18n.t("announcement.more")
+ read_more_text = I18n.t("curation.more")
if cats.count == 1 && cats[0] != "all"
begin
- read_more_text = I18n.t("announcement.more_") + ((all_tags.count == 1 && all_tags[0] != 'all') ? tags_translations[tags[0]] : cats_translations[cats[0]])
+ read_more_text = I18n.t("curation.more_") + ((all_tags.count == 1 && all_tags[0] != 'all') ? tags_translations[tags[0]] : cats_translations[cats[0]])
rescue
nil
end
@@ -476,15 +476,15 @@ class CurationsController < ApplicationController
"more_url"=>read_more_url,
"main_picture" => mp,
"main_picture_description" => mpd,
- "title-head" => t('announcement.table.title'),
- "date-head" => t('announcement.table.date'),
- "author-head" => t('announcement.table.author'),
- "annc-dept-head" => t("announcement.annc_dept"),
- "status-head" => t('announcement.table.status'),
- "subtitle-head" => t('announcement.table.sub_title'),
- "category-head" => t('announcement.table.category'),
- "link-head" => t('announcement.table.link'),
- "file-head" => t('announcement.table.file'),
+ "title-head" => t('curation.table.title'),
+ "date-head" => t('curation.table.date'),
+ "author-head" => t('curation.table.author'),
+ "annc-dept-head" => t("curation.annc_dept"),
+ "status-head" => t('curation.table.status'),
+ "subtitle-head" => t('curation.table.sub_title'),
+ "category-head" => t('curation.table.category'),
+ "link-head" => t('curation.table.link'),
+ "file-head" => t('curation.table.file'),
"read_more" => read_more_url,
"read_more_text" => "read more",
"extra_brefore_html" => extra_html,
@@ -503,7 +503,7 @@ class CurationsController < ApplicationController
@image_version = 'thumb'
@show_options = nil
if subpart.methods.include? 'select_options'.to_sym
- module_app = ModuleApp.where(key: 'announcement').first
+ module_app = ModuleApp.where(key: 'curation').first
if module_app
@show_options = module_app.show_options
end
@@ -514,30 +514,30 @@ class CurationsController < ApplicationController
tmp = value[:en]
case select_option.field_name
when @show_options.keys[0].to_s
- if tmp == t('announcement.small_size')
+ if tmp == t('curation.small_size')
@image_version = 'thumb'
- elsif tmp == t('announcement.medium_size')
+ elsif tmp == t('curation.medium_size')
@image_version = 'mobile'
- elsif tmp == t('announcement.orignal_size')
+ elsif tmp == t('curation.orignal_size')
@image_version = 'orignal'
end
when @show_options.keys[1].to_s
tab_options.each_with_index do |option,i|
- if tmp == t("announcement.#{option}")
+ if tmp == t("curation.#{option}")
@tab_option = i
break
end
end
when @show_options.keys[2].to_s
read_more_options.each_with_index do |option,i|
- if tmp == t("announcement.#{option}")
+ if tmp == t("curation.#{option}")
@read_more_option = i
break
end
end
when @show_options.keys[3].to_s
all_setting_options.each_with_index do |option,i|
- if tmp == t("announcement.#{option}")
+ if tmp == t("curation.#{option}")
@all_setting_option = i
break
end
@@ -564,7 +564,7 @@ class CurationsController < ApplicationController
end
subpart = OrbitHelper.get_current_widget
widget_data_count = OrbitHelper.widget_data_count
- anns_cache = AnnsCache.where(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s)
+ anns_cache = CurationCache.where(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s)
devide_flag = (!(defined? SiteFeed).nil?) && (SiteFeed.count != 0)
anns_cache.all_of([{:invalid_date.ne=>nil},{:invalid_date.lte => Time.now}]).destroy
count = anns_cache.count
@@ -572,9 +572,9 @@ class CurationsController < ApplicationController
anns_cache.limit(count-1).destroy
end
if anns_cache.count == 0 || is_random
- Bulletin.remove_expired_status
+ CurationPost.remove_expired_status
uid = OrbitHelper.params[:uid] rescue ""
- anns_for_locale = Bulletin.where(:title.nin => ["",nil], :uid.ne => uid).is_approved_and_show.filter_cats_and_tags(cats,tags)
+ anns_for_locale = CurationPost.where(:title.nin => ["",nil], :uid.ne => uid).is_approved_and_show.filter_cats_and_tags(cats,tags)
sorted_anns = anns_for_locale.can_display_and_sorted
if !is_random
sorted_anns = sorted_anns.limit(widget_data_count)
@@ -586,10 +586,10 @@ class CurationsController < ApplicationController
now_anns = sorted_anns.to_a
top_anns = now_anns.select{|v| v.is_top}.map{|v| data_to_human_type(v,set_tags)}
not_top_anns = now_anns.select{|v| !v.is_top}.map{|v| data_to_human_type(v,set_tags)}
- AnnsCache.create(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s,filter_result: {top: top_anns,not_top: not_top_anns},invalid_date: invalid_date)
+ CurationCache.create(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s,filter_result: {top: top_anns,not_top: not_top_anns},invalid_date: invalid_date)
else
anns = sorted_anns.map{|v| data_to_human_type(v,set_tags)}
- AnnsCache.create(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s,filter_result: anns,invalid_date: invalid_date)
+ CurationCache.create(parent_id: subpart.id.to_s + cats.to_s + tags.to_s + widget_data_count.to_s,locale: I18n.locale.to_s,filter_result: anns,invalid_date: invalid_date)
end
else
invalid_date = Time.now + 3.second
@@ -643,7 +643,7 @@ class CurationsController < ApplicationController
render :file => "#{Rails.root}/app/views/errors/404.html", :layout => false, :status => :not_found, :content_type => 'text/html'
return
end
- file = BulletinFile.find(params[:id])
+ file = CurationPostFile.find(params[:id])
if File.basename(file.file.path) != URI.decode(params[:f_name])
render :file => "#{Rails.root}/app/views/errors/403.html", :layout => false, :status => :not_found, :content_type => 'text/html'
return
@@ -680,21 +680,21 @@ class CurationsController < ApplicationController
def show_local_announcement(uid, is_preview)
locale = OrbitHelper.get_site_locale.to_s
if is_preview
- announcement = Bulletin.where(:uid => uid).first
+ announcement = CurationPost.where(:uid => uid).first
else
- announcement = Bulletin.can_display_and_sorted.where(:uid => uid).first
+ announcement = CurationPost.can_display_and_sorted.where(:uid => uid).first
end
- announcement = Bulletin.where(:uid => uid).first if announcement.nil?
+ announcement = CurationPost.where(:uid => uid).first if announcement.nil?
return nil if announcement.nil?
@bulletin = announcement
- url_to_edit = OrbitHelper.user_can_edit?(announcement) ? "/admin/announcements/#{announcement.id.to_s}/edit" : ""
+ url_to_edit = OrbitHelper.user_can_edit?(announcement) ? "/admin/curations/#{announcement.id.to_s}/edit" : ""
access_level = OrbitHelper.user_access_level?
if !announcement.approved && (access_level != "manager" && access_level != "admin")
- if AnnouncementSetting.is_pro?
- if !(access_level == "sub_manager" && AnnouncementSetting.first.approvers.include?(OrbitHelper.current_user.id.to_s))
+ if CurationSetting.is_pro?
+ if !(access_level == "sub_manager" && CurationSetting.first.approvers.include?(OrbitHelper.current_user.id.to_s))
return {}
end
elsif access_level != "sub_manager"
@@ -721,7 +721,7 @@ class CurationsController < ApplicationController
"alt_title" => '',
"carousel_html" => '',
"sub_anncs_text" => '',
- "body" => "#{I18n.t('announcement.expired')}
#{I18n.t('announcement.go_back')}".html_safe
+ "body" => "#{I18n.t('curation.expired')}
#{I18n.t('curation.go_back')}".html_safe
},
"comments" => [],
"show_comment_flag" => '',
@@ -735,8 +735,8 @@ class CurationsController < ApplicationController
"tag" => tag.name ,
"url" => OrbitHelper.page_for_tag(tag)
} } rescue []
- files = announcement.bulletin_files.to_fronted(locale)
- links = announcement.bulletin_links.map{|link| { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue []
+ files = announcement.curation_post_files.to_fronted(locale)
+ links = announcement.curation_post_links.map{|link| { "link_url" => link.url, "link_title" => (link.title.blank? ? link.url : link.title) } } rescue []
update_user = ""
if enable_annc_dept
update_user = annc_depts_translations[locale][announcement.annc_dept] rescue ""
@@ -744,7 +744,7 @@ class CurationsController < ApplicationController
update_user = announcement.update_user.member_profile.name rescue ""
end
desc = announcement.image_description
- desc = (desc.nil? || desc == "" ? "announcement image" : desc)
+ desc = (desc.nil? || desc == "" ? "curation image" : desc)
request = OrbitHelper.request
meta_desc = announcement.subtitle.nil? || announcement.subtitle == "" ? announcement.text.to_s[0..200] : announcement.subtitle
@@ -788,7 +788,7 @@ class CurationsController < ApplicationController
sub_anncs_text += "
| #{announcement.get_sub_annc_title_trans} | - #{display_sub_annc_date ? "#{I18n.t("announcement.table.date")} | " : ''} + #{display_sub_annc_date ? "#{I18n.t("curation.table.date")} | " : ''}
|---|