Merge branch 'master' of github.com:Rulingcom/NCCU

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

@@ -58,7 +58,7 @@ class Bulletin
   accepts_nested_attributes_for :bulletin_files, :allow_destroy => true
   accepts_nested_attributes_for :bulletin_links, :allow_destroy => true
   
-  validates :title, :presence => true
+  validates :title, :at_least_one => true
   
   before_save :check_deadline,:update_status,:update_avliable_language
   

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb

@@ -17,11 +17,11 @@
 	</li>
 	<li>
   <b><%= t('announcement.subtitle') %></b>
-  <%= @bulletin.subtitle.html_safe %>
+  <%= @bulletin.subtitle.html_safe rescue '' %>
 	</li>
 	<li>
   <b><%= t('announcement.text') %></b>
-  <%= @bulletin.text.html_safe %>
+  <%= @bulletin.text.html_safe rescue '' %>
 	</li>
 	<li>
 	<li>

vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/show.html.erb

@@ -12,7 +12,7 @@
 	<%= link_to image_tag(@bulletin.image.url, :size => "320x240"), @bulletin.image.url, {:target => '_blank', :title => @bulletin.image_identifier} if @bulletin.image.file %>
 </div>
 <div class="news_paragraph">
-	<%= @bulletin.text.html_safe %>
+	<%= @bulletin.text.html_safe rescue '' %>
 </div>
 <div class="linkAndFile">
 	<% if @bulletin.bulletin_links.size > 0 %>