Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

app/helpers/welcome_helper.rb

@@ -77,7 +77,10 @@ module WelcomeHelper
     when 'news' , 'issue', 'message' , 'bid' , 'wiki-page' , 'document'
       str << content_tag("span", "发表了") << content_tag("span", find_all_event_type(event)) << ':&nbsp;'.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url, :target => "_blank" )
     when 'reply' ,'Reply', 'Memo'
-      str << content_tag("span", "发表了") << content_tag("span", find_all_event_type(event)) << ':&nbsp;'.html_safe << link_to(truncate(strip_tags(event.event_description), length: 30, omission:'...'), event.event_url, :target => "_blank" )
+      str << content_tag("span", "发表了") << 
+        content_tag("span", find_all_event_type(event)) << 
+        ':&nbsp;'.html_safe << 
+        link_to(truncate(strip_tags(event.event_description).gsub(/&nbsp;/,''), length: 30, omission:'...'), event.event_url, :target => "_blank" )
     when 'attachment'
       str << content_tag('span', '上传了') << content_tag('span', find_all_event_type(event)) << ':&nbsp;'.html_safe << link_to(truncate(event.event_title, length: 30, omission:'...'), event.event_url) << link_to(('&nbsp;['.html_safe+l(:label_downloads_list).to_s << ']'), project_files_path(event.container))
     else

app/models/journal_observer.rb

@@ -18,15 +18,14 @@
 class JournalObserver < ActiveRecord::Observer
   def after_create(journal)
     if journal.notify? &&
-        (Setting.notified_events.include?('issue_updated') ||
+      (Setting.notified_events.include?('issue_updated') ||
-          (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) ||
+        (Setting.notified_events.include?('issue_note_added') && journal.notes.present?) ||
-          (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
+        (Setting.notified_events.include?('issue_status_updated') && journal.new_status.present?) ||
-          (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
+        (Setting.notified_events.include?('issue_priority_updated') && journal.new_value_for('priority_id').present?)
         )
-             ##by senluo
+      # Thread.new do
-       thread4=Thread.new do
+        Mailer.issue_edit(journal).deliver
-          Mailer.issue_edit(journal).deliver
+      # end
-       end
     end
   end
 end