From 6bb649e831d7ab3dbb3bf869028a1c3e9f004eca Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 27 May 2015 08:36:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?issue=E5=BC=95=E7=94=A8=E5=9C=A8=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=8A=A8=E6=80=81=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb   | 2 +-
 app/views/projects/show.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 88bbb4a71..987b92570 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -103,11 +103,11 @@
       </div>
   <!--problem_main end-->
   <div style="clear: both;"></div>
+  <!--留言-->
   <% if @issue.editable? %>
       <div id="update">
         <%= render :partial => 'edit' %>
       </div>
-      <!--留言-->
       <p style="padding-top: 5px"></p>
       <a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="issue_desc_editor.sync();$('#issue-form').submit();">
         <%= l(:button_submit) %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index f3c453019..ffeeaef82 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -51,7 +51,7 @@
                   <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"),
                               {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %>
                 </a><br />
-                <p class="mt5 break_word"><%= textAreailizable act,:notes %><br />
+                <p class="mt5 break_word"><%= textilizable act,:notes %><br />
                   <%= l :label_activity_time %> ：<%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></p>
               </div>
               <div class="cl"></div>

From 10e24bebd50c9e4e3bc63ca68f87266e65e7e8ce Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 27 May 2015 08:56:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/courses_service.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb
index 26d8df16f..49170bf30 100644
--- a/app/services/courses_service.rb
+++ b/app/services/courses_service.rb
@@ -364,19 +364,20 @@ class CoursesService
       latest_course_dynamics = []
       latest_news = course.news.order("created_on desc").first
       unless latest_news.nil?
-        latest_course_dynamics << {:type => 1,:time => latest_news.created_on,:message => l(:label_recently_updated_notification,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 1,:time => latest_news.created_on,
+                                   :message =>latest_news.author.realname<< l(:label_recently_updated_notification,:locale => get_user_language(current_user))<<"："<< latest_news.title }
       end
       latest_message = course.journals_for_messages.order("created_on desc").first
       unless latest_message.nil?
-        latest_course_dynamics << {:type => 2,:time => latest_message.created_on,:message => l(:label_recently_updated_message,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 2,:time => latest_message.created_on,:message =>latest_message.user.realname << l(:label_recently_updated_message,:locale => get_user_language(current_user))<<"："<<latest_message.notes}
       end
       latest_attachment = course.attachments.order("created_on desc").first
       unless latest_attachment.nil?
-        latest_course_dynamics << {:type => 3,:time => latest_attachment.created_on,:message => l(:label_recently_updated_courseware,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 3,:time => latest_attachment.created_on,:message =>latest_attachment.author.realname<< l(:label_recently_updated_courseware,:locale => get_user_language(current_user))<<"："<<latest_attachment.filename}
       end
       latest_bid = course.homeworks.order('updated_on DESC').first
       unless latest_bid.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 4,:time => latest_bid.updated_on,:message => latest_bid.author.realname<<l(:label_recently_updated_homework,:locale => get_user_language(current_user))<<"："<<latest_bid.name}
       end
 
       # Time 2015-04-07 14:58:30
@@ -416,7 +417,7 @@ class CoursesService
       end
       latest_homework_attach = homeworks.first
       unless latest_homework_attach.nil?
-        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message => l(:label_recently_updated_homework,:locale => get_user_language(current_user))}
+        latest_course_dynamics << {:type => 4,:time => latest_homework_attach.updated_at,:message =>latest_homework_attach.user.realname<< l(:label_recently_updated_homework,:locale => get_user_language(current_user))<<"："<<(latest_homework_attach.name.nil? ? latest_homework_attach.description : latest_homework_attach.name)}
       end
       latest_course_dynamics.sort!{|order,newer| newer[:time] <=> order[:time]}
       latest_course_dynamic = latest_course_dynamics.first