From ba7ac5d9544b4d7de7bfab9bda2824b7396a90db Mon Sep 17 00:00:00 2001
From: chris <chris.vilayphiou@gmail.com>
Date: Sat, 14 Sep 2013 11:54:35 +0800
Subject: [PATCH] Fix [app_name]_category_with_title and change announcement
 init

---
 vendor/built_in_modules/announcement/app/models/bulletin.rb   | 2 +-
 vendor/built_in_modules/announcement/config/locales/en.yml    | 1 +
 vendor/built_in_modules/announcement/config/locales/zh_tw.yml | 1 +
 vendor/built_in_modules/announcement/init.rb                  | 3 ++-
 vendor/built_in_modules/faq/app/models/qa.rb                  | 2 +-
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 8759efa6..c76371b1 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -64,7 +64,7 @@ class Bulletin
     end
   
   def bulletin_category_with_title
-    self.bulletin_category.title
+    self.category.title
   end
 
   def share_item
diff --git a/vendor/built_in_modules/announcement/config/locales/en.yml b/vendor/built_in_modules/announcement/config/locales/en.yml
index 6f204af9..990fcd78 100644
--- a/vendor/built_in_modules/announcement/config/locales/en.yml
+++ b/vendor/built_in_modules/announcement/config/locales/en.yml
@@ -15,6 +15,7 @@ en:
     default_widget:
       bulletin_category_with_title: Bulletin Category with Title
       postdate: Post Date
+      subtitle: Subtitle
       title: Title
     editing_announcement: Edit Announcement
     editing_announcement_category: Edit Category
diff --git a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
index 21ca4e8c..6979b55b 100644
--- a/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
+++ b/vendor/built_in_modules/announcement/config/locales/zh_tw.yml
@@ -15,6 +15,7 @@ zh_tw:
     default_widget:
       bulletin_category_with_title: 公告類別及標題
       postdate: 張貼日期
+      subtitle: 副標題
       title: 標題
     editing_announcement: 編輯類別
     editing_announcement_category: 編輯類別
diff --git a/vendor/built_in_modules/announcement/init.rb b/vendor/built_in_modules/announcement/init.rb
index 0c55fda3..cb1b9fb6 100644
--- a/vendor/built_in_modules/announcement/init.rb
+++ b/vendor/built_in_modules/announcement/init.rb
@@ -33,11 +33,12 @@ module Announcement
     widgets do
       default_widget do
         query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )'
-        enable ["typeA","typeC"]
+        enable ["typeA", "typeB_style3", "typeC"]
         image :image
         field :postdate
         link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
         link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:bulletin_category,:id]}}
+        field :subtitle
         link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
       end
 
diff --git a/vendor/built_in_modules/faq/app/models/qa.rb b/vendor/built_in_modules/faq/app/models/qa.rb
index a48800cf..0871923b 100644
--- a/vendor/built_in_modules/faq/app/models/qa.rb
+++ b/vendor/built_in_modules/faq/app/models/qa.rb
@@ -53,7 +53,7 @@ class Qa
   protected
 
   def qa_category_with_title
-    self.qa_category.title
+    self.category.title
   end
 
   def clean_values