remove bulletins_list

vendor/built_in_modules/announcement/announcement.json

@@ -7,6 +7,6 @@
   "update_info": "Some info",
   "create_date": "11-11-2011",
 	"app_pages":  ["bulletins"],
-	"widgets": ["bulletins","bulletins_list", "bulletins_and_web_links"],
+	"widgets": ["bulletins", "bulletins_and_web_links"],
 	"enable_frontend": true
 }

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -19,17 +19,6 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
 	
   end
   
-  def bulletins_list
-  
-    @bulletins = Bulletin.widget_datas.limit(5)
-	
-	# get_categorys
-  	
-  	module_app = ModuleApp.first(:conditions => {:key => 'announcement'})
-  	@tags = Tag.all(:conditions => {:module_app_id => module_app.id})
-	
-  end
-  
   def bulletins_and_web_links
     @tags = AnnouncementTag.all
     @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]

vendor/built_in_modules/announcement/app/models/announcement_tag.rb

@@ -4,7 +4,7 @@ class AnnouncementTag < Tag
   
   
   def get_visible_bulletins(sort = :name)
-	  self.bulletins.where(:is_hidden => false).desc(:is_top, sort)
+	  self.bulletins.where(:is_hidden => false).any_of( {deadline: nil,:postdate.lte => date_now} , {:deadline.gte => date_now,:postdate.lte => date_now} ).desc(:is_top, sort)
   end
   
 end

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/bulletins_and_web_links.html.erb

@@ -6,12 +6,12 @@
 
 <div>
 	<ul id='bulletins_web_links_bulletins'>
-		<%= render 'bulletins' %>
+		<%= render 'bulletins' if @bulletins %>
 	</ul>
 </div>
 
 <div>
 	<ul id='bulletins_web_links_web_links'>
-		<%= render 'web_links' %>
+		<%= render 'web_links' if @web_links %>
 	</ul>
 </div>

vendor/built_in_modules/announcement/config/routes.rb

@@ -15,7 +15,6 @@ Rails.application.routes.draw do
       end
       namespace :widget do
         match "bulletins" => "bulletins#index"
-        match "bulletins_list" => "bulletins#bulletins_list"
         match "bulletins_and_web_links" => "bulletins#bulletins_and_web_links"
         match "reload_bulletins" => "bulletins#reload_bulletins"
         match "reload_web_links" => "bulletins#reload_web_links"