saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix [app_name]_category_with_title and change announcement init

This commit is contained in:
chris 2013-09-14 11:54:35 +08:00
parent 9cc1e95cb1
commit ba7ac5d954
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/built_in_modules/announcement/app/models/bulletin.rb vendored
View File

@ -64,7 +64,7 @@ class Bulletin
end end
def bulletin_category_with_title def bulletin_category_with_title
self.bulletin_category.title self.category.title
end end
def share_item def share_item

1
vendor/built_in_modules/announcement/config/locales/en.yml vendored
View File

@ -15,6 +15,7 @@ en:
default_widget: default_widget:
bulletin_category_with_title: Bulletin Category with Title bulletin_category_with_title: Bulletin Category with Title
postdate: Post Date postdate: Post Date
subtitle: Subtitle
title: Title title: Title
editing_announcement: Edit Announcement editing_announcement: Edit Announcement
editing_announcement_category: Edit Category editing_announcement_category: Edit Category

1
vendor/built_in_modules/announcement/config/locales/zh_tw.yml vendored
View File

@ -15,6 +15,7 @@ zh_tw:
default_widget: default_widget:
bulletin_category_with_title: 公告類別及標題 bulletin_category_with_title: 公告類別及標題
postdate: 張貼日期 postdate: 張貼日期
subtitle: 副標題
title: 標題 title: 標題
editing_announcement: 編輯類別 editing_announcement: 編輯類別
editing_announcement_category: 編輯類別 editing_announcement_category: 編輯類別

3
vendor/built_in_modules/announcement/init.rb vendored
View File

@ -33,11 +33,12 @@ module Announcement
widgets do widgets do
default_widget do default_widget do
query 'Bulletin.any_of( {deadline: nil,:postdate.lte => Time.now} , {:deadline.gte => Time.now,:postdate.lte => Time.now} )' 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 image :image
field :postdate field :postdate
link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self} 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]}} 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' link_to_more 'panel_announcement_front_end_bulletins_path',:title_i18n=> 'more_plus'
end end

2
vendor/built_in_modules/faq/app/models/qa.rb vendored
View File

@ -53,7 +53,7 @@ class Qa
protected protected
def qa_category_with_title def qa_category_with_title
self.qa_category.title self.category.title
end end
def clean_values def clean_values