announcement widget page

This commit is contained in:
unknown 2012-01-20 14:04:52 +08:00
parent 4cfae9c107
commit 2c8940e350
4 changed files with 10 additions and 8 deletions

View File

@ -9,7 +9,11 @@ class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
# GET /bulletins.xml
def index
@bulletins = Bulletin.desc("postdate")
date_now = Time.now
@bulletins = Bulletin.any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate)
get_categorys
end

View File

@ -61,11 +61,13 @@ class Bulletin
def self.widget_datas
date_now = Date.today
date_now = Time.now
# find(:all, :conditions => {:postdate => {"$lte" => Date.today}, deadline: nil} ).desc( :is_top, :postdate)
where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
# where( :postdate.lte => date_now ).where( :deadline => nil ).desc(:is_top, :postdate)
# any_of({ :title => "test" },{:deadline => nil, :title => "123"})
any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc( :is_top, :postdate).limit(5)
end

View File

@ -7,18 +7,14 @@
<table>
<tr>
<th><%= t('bulletin.status') %></th>
<th><%= t('bulletin.postdate') %></th>
<th><%= t('bulletin.deadline') %></th>
<th><%= t('bulletin.category') %></th>
<th><%= t('bulletin.title') %></th>
</tr>
<% @bulletins.each do |post| %>
<tr>
<td></td>
<td><%= post.postdate %></td>
<td><%= (post.deadline) ? post.deadline : t('bulletin.no_deadline') %></td>
<td><%= post.bulletin_category.i18n_variable[I18n.locale] %></td>
<td><%= link_to post.title, panel_announcement_front_end_bulletin_path(post) %>
<%#= link_to post.title, panel_announcement_back_end_bulletin_path(post) %>

View File

@ -50,7 +50,7 @@
</li>
<li>
<b><%= t('announcement.最後修改時間') %></b>
<%= @bulletin.updated_at %>
<%= @bulletin.updated_at.strftime("%Y-%m-%d %H:%I:%S") %>
</li>