From f66c3d9c0c4f1ce6008782cc8b40ea42f8fd8c9c Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Fri, 29 Jun 2012 11:17:35 +0800
Subject: [PATCH] fix bugs.

---
 .../panel/announcement/back_end/bulletins_controller.rb  | 2 +-
 .../built_in_modules/announcement/app/models/bulletin.rb | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
index e2b8b7cff..a89b203b9 100644
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
+++ b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
@@ -320,7 +320,7 @@ class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
   protected
   
   def delete_out_invalid_date_from_params()
-    if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? orparams[:bulletin]["deadline(3i)"].empty?) 
+    if(params[:bulletin]["deadline(1i)"].empty? or params[:bulletin]["deadline(2i)"].empty? or params[:bulletin]["deadline(3i)"].empty?) 
       params[:bulletin].delete("deadline(1i)")
       params[:bulletin].delete("deadline(2i)")
       params[:bulletin].delete("deadline(3i)")
diff --git a/vendor/built_in_modules/announcement/app/models/bulletin.rb b/vendor/built_in_modules/announcement/app/models/bulletin.rb
index 589da3208..c083ecfe6 100644
--- a/vendor/built_in_modules/announcement/app/models/bulletin.rb
+++ b/vendor/built_in_modules/announcement/app/models/bulletin.rb
@@ -50,7 +50,7 @@ class Bulletin
   
   validates_presence_of :title
   
-  before_save :set_key, :update_status
+  before_save :set_key, :update_status,:check_deadline
   
   after_save :save_bulletin_links
   after_save :save_bulletin_files
@@ -159,6 +159,13 @@ class Bulletin
   
   protected
   
+  def check_deadline
+    if(!self.deadline.nil? and (self.deadline<= self.postdate ))
+      self.deadline = nil   
+    end
+
+  end
+
   def set_key
     if title && title.new_record?
       title.key = 'title'