Merge branch 'new_rss' of github.com:Rulingcom/NCCU into new_rss

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

@@ -62,7 +62,7 @@ class Bulletin
   
   validates :title, :at_least_one => true
 
-  before_save :check_deadline,:update_status,:update_avliable_language
+  before_save :check_deadline, :update_avliable_language
 
   before_save :fetch_dept  
   after_save :save_bulletin_links
@@ -225,4 +225,4 @@ class Bulletin
     self.cache_dept = (User.current.cache_dept rescue nil) || (User.find(self.create_user_id).cache_dept rescue nil) 
   end
 
-end
+end

vendor/built_in_modules/news/app/models/news_bulletin.rb

@@ -165,7 +165,7 @@ class NewsBulletin
         self.not_checked_reason = not_pass_info
       end
   end
-
+  
   def enabled_for_lang(lang)
     eval("self.available_for_#{lang}")
   end
@@ -248,4 +248,4 @@ class NewsBulletin
     end
   end
 
-end
+end