diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index 6c3aa066f..a5cad78d0 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -8,13 +8,13 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
# GET /bulletins
# GET /bulletins.xml
def index_bulletins_by_unit
- @page = Page.find(params[:page_id])
+ @page = Page.find(params[:page_id]) rescue nil
@bulletins=Bulletin.all.available_for_lang(I18n.locale).can_display.where("cache_dept.#{I18n.locale.to_s.downcase}"=>params[:name]).page( params[:page_main]).per(15)
render :index
end
def index
- @page = Page.find(params[:page_id])
+ @page = Page.find(params[:page_id]) rescue nil
if !params[:search_query].blank?
# search_cond = {:is_checked=>true,:is_hidden=>false,:is_pending => false}
# search_cond.merge!({:bulletin_category_id => "#{params[:category_id]}" }) if !params[:category_id].blank?
@@ -49,7 +49,7 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
end
def show
- @page = Page.find(params[:page_id])
+ @page = Page.find(params[:page_id]) rescue nil
if params[:preview] == "true"
preview_content
else
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
index 9ba18b9c9..798ff5172 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
@@ -2,7 +2,7 @@
<%= flash_messages %>
-<%= @page.title %>
+<%= @page.title rescue nil %>
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder
index c0dd32e05..9c224ecea 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.rss.builder
@@ -2,7 +2,7 @@ xml.instruct! :xml, :version => "1.0"
xml.rss :version => "2.0" do
xml.channel do
if @current_category
- xml.title @current_category.i18n_variable[I18n.locale]
+ xml.title @current_category.title_translations[I18n.locale.to_s]
else
xml.title t('announcement.announcement')
end
@@ -10,8 +10,7 @@ xml.rss :version => "2.0" do
for bulletin in @bulletins
xml.item do
- xml.title bulletin.title[I18n.locale]
- xml.description bulletin.subtitle[I18n.locale]
+ xml.title bulletin.title_translations[I18n.locale.to_s]
xml.pubDate bulletin.postdate.to_s(:rfc822)
xml.link panel_announcement_front_end_bulletin_path(bulletin, :rss)
xml.guid panel_announcement_front_end_bulletin_path(bulletin, :rss)
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder
index 8fb929f58..e9df51f4a 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.rss.builder
@@ -2,7 +2,7 @@ xml.instruct! :xml, :version => "1.0"
xml.rss :version => "2.0" do
xml.channel do
if @current_category
- xml.title @current_category.i18n_variable[I18n.locale]
+ xml.title @current_category.title_translations[I18n.locale.to_s]
else
xml.title t('announcement.announcement')
end
diff --git a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
index 8b665b248..0e9f0ac31 100644
--- a/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
+++ b/vendor/built_in_modules/news/app/controllers/panel/news/front_end/news_bulletins_controller.rb
@@ -9,13 +9,13 @@ class Panel::News::FrontEnd::NewsBulletinsController < OrbitWidgetController
# GET /news_bulletins.xml
def index_news_bulletins_by_unit
- @page = Page.find(params[:page_id])
+ @page = Page.find(params[:page_id]) rescue nil
@news_bulletins=NewsBulletin.all.available_for_lang(I18n.locale).can_display.where("unit_list_for_anc_id"=>params[:name]).page( params[:page_main]).per(15).page( params[:page_main]).per(10)
render :index
end
def index
- @page = Page.find(params[:page_id])
+ @page = Page.find(params[:page_id]) rescue nil
if !params[:search_query].blank?
# search_cond = {:is_checked=>true,:is_hidden=>false,:is_pending=>false,:is_pending=>false}
# search_cond.merge!({:news_bulletin_category_id => "#{params[:category_id]}" }) if !params[:category_id].blank?
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
index 3324928c7..fc232e8bc 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
@@ -2,7 +2,7 @@
<%= flash_messages %>
-<%= @page.title %>
+<%= @page.title rescue nil %>
<% if !params[:name].blank?%>
<%= t("search.unit_get",:unit_name => UnitListForAnc.find(params[:name]).title,:item_num=>@news_bulletins.count) %>
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder
index b4901f70b..058e296ce 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.rss.builder
@@ -2,7 +2,7 @@ xml.instruct! :xml, :version => "1.0"
xml.rss :version => "2.0" do
xml.channel do
if @current_category
- xml.title @current_category.i18n_variable[I18n.locale]
+ xml.title @current_category.title_translations[I18n.locale.to_s]
else
xml.title t('news.campus_news')
end
@@ -10,8 +10,8 @@ xml.rss :version => "2.0" do
for news_bulletin in @news_bulletins
xml.item do
- xml.title news_bulletin.title[I18n.locale]
- xml.description news_bulletin.text[I18n.locale]
+ xml.title news_bulletin.title_translations[I18n.locale.to_s]
+ xml.description news_bulletin.subtitle_translations[I18n.locale.to_s]
xml.pubDate news_bulletin.postdate.to_s(:rfc822)
xml.link panel_news_front_end_news_bulletin_path(news_bulletin, :rss)
xml.guid panel_news_front_end_news_bulletin_path(news_bulletin, :rss)
diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder
index ba01a48e8..3def9abe7 100644
--- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder
+++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/show.rss.builder
@@ -2,7 +2,7 @@ xml.instruct! :xml, :version => "1.0"
xml.rss :version => "2.0" do
xml.channel do
if @current_category
- xml.title @current_category.i18n_variable[I18n.locale]
+ xml.title @current_category.title_translations[I18n.locale.to_s]
else
xml.title t('news.campus_news')
end