From 0ecb4eca463bf76961eaf59847eb3bbb98ed1dff Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Tue, 18 Sep 2012 10:54:11 +0800 Subject: [PATCH] change for NCCU entry site --- .../announcement/front_end/bulletins/index.rss.builder | 6 +++--- .../announcement/front_end/bulletins/show.rss.builder | 7 +++---- .../panel/news/front_end/news_bulletins/index.rss.builder | 6 +++--- .../panel/news/front_end/news_bulletins/show.rss.builder | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) 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 9c224ece..ecc144b5 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 @@ -6,14 +6,14 @@ xml.rss :version => "2.0" do else xml.title t('announcement.announcement') end - xml.link panel_announcement_front_end_bulletins_path(:rss) + xml.link url_for(:action=>"index", :controller=>"panel/announcement/front_end/bulletins",:format=> :rss,:only_path=>false,:inner=>true) for bulletin in @bulletins xml.item do 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) + xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:format=> :rss,:only_path=>false,:inner=>true) + xml.guid url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>bulletin ,:format=> :rss,:only_path=>false,:inner=>true) end end end 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 e9df51f4..f1853cba 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 @@ -6,14 +6,13 @@ xml.rss :version => "2.0" do else xml.title t('announcement.announcement') end - xml.link panel_announcement_front_end_bulletins_path(:rss) - + xml.link url_for(:action=>"index", :controller=>"panel/announcement/front_end/bulletins",:format=> :rss,:only_path=>false,:inner=>true) xml.item do xml.title @bulletin.title xml.description @bulletin.text 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) + xml.link url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>@bulletin ,:format=> :rss,:only_path=>false,:inner=>true) + xml.guid url_for(:action=>"show", :controller=>"panel/announcement/front_end/bulletins", :id=>@bulletin ,:format=> :rss,:only_path=>false,:inner=>true) end # end end 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 058e296c..be5150aa 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 @@ -6,15 +6,15 @@ xml.rss :version => "2.0" do else xml.title t('news.campus_news') end - xml.link panel_news_front_end_news_bulletins_path(:rss) + xml.link url_for(:action=>"index", :controller=>"panel/news/front_end/news_bulletins" ,:format=> :rss,:only_path=>false,:inner=>true) for news_bulletin in @news_bulletins xml.item do 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) + xml.link url_for(:action=>"show", :controller=>"panel/news/front_end/news_bulletins", :id=>news_bulletin ,:format=> :rss,:only_path=>false,:inner=>true) + xml.guid url_for(:action=>"show", :controller=>"panel/news/front_end/news_bulletins", :id=>news_bulletin ,:format=> :rss,:only_path=>false,:inner=>true) end end end 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 3def9abe..58681031 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 @@ -6,15 +6,15 @@ xml.rss :version => "2.0" do else xml.title t('news.campus_news') end - xml.link panel_news_front_end_news_bulletins_path(:rss) + xml.link url_for(:action=>"index", :controller=>"panel/news/front_end/news_bulletins" ,:format=> :rss,:only_path=>false,:inner=>true) # for news_bulletin in @news_bulletins xml.item do xml.title @news_bulletin.title xml.description @news_bulletin.text 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) + xml.link url_for(:action=>"show", :controller=>"panel/news/front_end/news_bulletins", :id=>news_bulletin ,:format=> :rss,:only_path=>false,:inner=>true) + xml.guid url_for(:action=>"show", :controller=>"panel/news/front_end/news_bulletins", :id=>news_bulletin ,:format=> :rss,:only_path=>false,:inner=>true) end # end end