From ef05867e6e2fbca46a45040d8b0f580df6ea4814 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 7 Mar 2016 10:58:41 +0800
Subject: [PATCH 01/32] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/schema.rb b/db/schema.rb
index 9b2b6e942..2781c7614 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -99,6 +99,8 @@ ActiveRecord::Schema.define(:version => 20160303103231) do
     t.integer  "quotes"
     t.integer  "version"
     t.integer  "attachment_id"
+    t.integer  "is_publish",                   :default => 1
+    t.date     "publish_time"
   end
 
   create_table "attachments", :force => true do |t|
@@ -1277,7 +1279,6 @@ ActiveRecord::Schema.define(:version => 20160303103231) do
     t.text     "description"
     t.integer  "creator_id"
     t.integer  "home_id"
-    t.string   "domain"
     t.boolean  "is_public"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
@@ -1385,7 +1386,6 @@ ActiveRecord::Schema.define(:version => 20160303103231) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end

From 56372fbdd5d9272bfc39a239982cf918847b544a Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 7 Mar 2016 16:50:30 +0800
Subject: [PATCH 02/32] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=B7=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/layouts/base_courses.html.erb | 34 +++++++++++++------------
 public/stylesheets/courses.css          |  7 +++--
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 2a44f2980..59ed3ad39 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -143,18 +143,19 @@
       <% unless contributor_course_scor(@course.id).count == 0 %>
         <ul class="rankList">
         <h4>课程活跃度
-          <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a>
+          <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor: pointer; position:relative;">积分规则</a>
         </h4>
-          <div  style="display: none;padding: 5px;" class="numIntro color_888">
-            <div class="contributor_course_innor">积分规则</div>
-            资源发布：资源数 x 5 </br>
-            问答发布：发帖数 x 2 </br>
-            通知发布：通知数 x 1 </br>
-            问答回复：回复数 x 1 </br>
-            作业留言：留言数 x 1 </br>
-            通知留言：留言数 x 1 </br>
-            课程留言：留言数 x 1  </br>
-            总得分为以上得分之和
+          <div  class="numIntro undis" style="cursor:pointer;">
+            <div class="active-degree-rule">
+            积分规则<br/>
+            资源发布：资源数 x 5 <br/>
+            问答发布：发帖数 x 2 <br/>
+            通知发布：通知数 x 1 <br/>
+            问答回复：回复数 x 1 <br/>
+            作业留言：留言数 x 1 <br/>
+            通知留言：留言数 x 1 <br/>
+            课程留言：留言数 x 1  <br/>
+            总得分为以上得分之和</div>
          </div>
 
         <% contributor_course_scor(@course.id).each do |contributor_score| %>
@@ -168,8 +169,8 @@
               <p><span class="c_green" style="cursor:pointer">
                 <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
                   <%=total_score %></a></span></p>
-              <div  style="display: none" class="numIntro color_888">
-                <div class="contributor_course_calculate">积分计算</div>
+              <div  style="display: none" class="numIntro">
+                <div class="contributor-course-calculate">积分计算</div>
                 <%# unless  contributor_score.resource_num.to_i == 0 %>
                 <div style="padding-left: 2px;padding-bottom: 2px;padding-right: 2px">
                   资源发布数 x 5 = <%= contributor_score.resource_num.to_i %> x 5 = <%= contributor_score.resource_num.to_i * 5 %></br>
@@ -208,10 +209,11 @@
       <% unless hero_homework_scores.map(&:score).detect{|s| s.to_i != 0}.nil? %>
         <ul class="rankList">
           <h4><span>课程英雄榜</span>
-            <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))">积分规则</a></h4>
-          <div  style="display: none" class="numIntro color_888">
-            <div class="hero_course_innor">积分规则</div>
+            <a class="contributor_course" onmouseover ="message_titile_show2($(this),event)" onmouseout ="message_titile_hide2($(this))" style="cursor:pointer;">积分规则</a></h4>
+          <div  style="cursor:pointer;" class="numIntro undis">
+            <div class="hero-degree-rule">积分规则<br/>
             英雄榜的得分是每个同学作业的得分总和
+            </div>
           </div>
           <% hero_homework_scores.each do |student_score| %>
               <% if student_score.score.to_i != 0 %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 8e83f2e18..1c832b4b3 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1286,7 +1286,6 @@ a.chooseActive {background-color:#269ac9; color:#ffffff;}
 .subjectType {width:70px; text-align:center;}
 .subjectCount {width:65px; text-align:center;}
 a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: normal;}
-.contributor_course_innor{font-size: 12px;color: #888;padding-left: 36px;}
-.hero_course_innor{font-size: 12px;color: #888;padding-left:77px;}
-.contributor_course_calculate{padding-left: 54px; font-size: 12px;color: #888}
-.color_888{color: #888}
+.active-degree-rule{font-size: 12px;color: #888; text-align: center; cursor: pointer;}
+.hero-degree-rule{font-size: 12px;color: #888;text-align: center;}
+.contributor-course-calculate{padding-left: 54px; font-size: 12px;color: #888}

From ca094a13b51fb83b3324c406aa970a71366c7c7d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 8 Mar 2016 10:16:55 +0800
Subject: [PATCH 03/32] =?UTF-8?q?=E4=BC=98=E7=A7=80=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E4=B8=AD=EF=BC=8C=E4=B8=8D=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=9A=84=EF=BC=8C=E5=B0=B1=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E3=80=82=E8=80=81=E5=B8=88=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=BA=86=E5=AE=8C=E5=85=A8=E5=85=AC=E5=BC=80=E7=9A=84=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=EF=BC=8C=E5=B0=B1=E6=9C=89=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizations/_org_course_homework.html.erb    | 14 ++++++++++++--
 app/views/users/_course_homework.html.erb          | 14 ++++++++++++--
 app/views/users/_user_homework_detail.html.erb     | 14 ++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 0e056c972..2cf1810ad 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -154,8 +154,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index d42dc152d..9dd5eaa7a 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -153,8 +153,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => activity.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 0c2856c89..9f3847735 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -157,8 +157,18 @@
           <% end %>
           <% student_works.each_with_index do |sw, i| %>
               <div class="fl mr10 w100" style="text-align:center;">
-                <a href="javascript:void(0);" class="linkBlue"><%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
-                  <p class="w100 hidden"><%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%></p>
+                <a href="javascript:void(0);" class="linkBlue">
+                  <% if User.current.member_of_course?(homework_common.course) || User.current.admin? || homework_common.is_open == 1 %>
+                      <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %>
+                      <p class="w100 hidden">
+                        <%= link_to sw.user.show_name, student_work_index_path(:homework => homework_common.id)%>
+                      </p>
+                  <% else %>
+                      <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %>
+                      <p class="w100 hidden">
+                        <a href="javascript:void(0);" title="该作业的作品暂未公开"><%=sw.user.show_name %></a>
+                      </p>
+                  <% end %>
                 </a>
                 <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>
                 <p class="fontGrey2">分数：<span class="c_red"><%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分</span></p>

From ec4a3b321c792c049b19f0f90a6cd5406e8870b7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Mar 2016 11:26:55 +0800
Subject: [PATCH 04/32] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=EF=BC=8C=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=BC=95=E7=94=A8=E6=AC=A1=E6=95=B0=E4=B8=8D=E6=B8=85?=
 =?UTF-8?q?=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/attachments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index cf4e6a8e9..b878a14ac 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -251,7 +251,7 @@ class AttachmentsController < ApplicationController
       @history.version =  @old_history.nil? ? 1 :  @old_history.version + 1
       @history.save  #历史记录保存完毕
       #将最新保存的记录 数据替换到 需要修改的文件记录
-      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads")
+      @old_attachment.attributes = @attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes")
       @old_attachment.save
       #删除当前记录
       @attachment.delete

From 4442d286ce301a3fa1b02160133a83a6ea1613e5 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 8 Mar 2016 15:20:38 +0800
Subject: [PATCH 05/32] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=BF=9E=E6=8E=A5=E6=94=B9=E6=88=90https://w?=
 =?UTF-8?q?ww.=E2=80=A6=E2=80=A6=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb              | 10 ++++++++++
 .../organizations/_org_activities.html.erb     |  2 +-
 .../organizations/_org_course_create.html.erb  |  6 +++---
 .../_org_course_homework.html.erb              | 12 ++++++------
 .../organizations/_org_course_message.html.erb | 14 +++++++-------
 .../organizations/_org_course_news.html.erb    | 14 +++++++-------
 .../organizations/_org_course_poll.html.erb    |  6 +++---
 .../organizations/_org_project_issue.html.erb  | 18 +++++++++---------
 .../_org_subfield_message.html.erb             | 14 +++++++-------
 .../organizations/_org_subfield_news.html.erb  | 14 +++++++-------
 .../organizations/_project_create.html.erb     |  6 +++---
 .../organizations/_project_message.html.erb    | 14 +++++++-------
 .../organizations/_show_org_document.html.erb  | 10 +++++-----
 app/views/users/_show_detail_info.html.erb     |  2 +-
 14 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bf7a5fdf9..71e19375f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2895,3 +2895,13 @@ int main(int argc, char** argv){
     end
   end
 end
+
+def user_url_in_org(user_id)
+  if Rails.env.development?
+    return "http://localhost:3000/users/" + user_id.to_s
+  elsif Rails.env.test?
+    return "https://www.test.forge.net/users/" + user_id.to_s
+  else
+    return "https://www.trustie.net/users/" + user_id.to_s
+  end
+end
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 20b98ffa0..c5ec9cd4a 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -50,7 +50,7 @@
                       <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(act.user_id)} %>
                     </div>
                     <div class="homepagePostDes">
-                      <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_path(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
+                      <div class="homepagePostTo"><%= link_to User.find(act.user_id), user_url_in_org(act.user_id) %>&nbsp;&nbsp;创建了 <a href="<%= organization_path(@organization)%>" class="newsBlue ml10"><%= Organization.find(act.org_act_id).name %>
                         | 组织</a></div>
                       <div class="homepagePostDate"> 创建时间：<%= format_activity_day(act.created_at) %> <%= format_time(act.created_at, false) %> </div>
                     </div>
diff --git a/app/views/organizations/_org_course_create.html.erb b/app/views/organizations/_org_course_create.html.erb
index dc1e0ee81..3e22f33e1 100644
--- a/app/views/organizations/_org_course_create.html.erb
+++ b/app/views/organizations/_org_course_create.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_path(activity.tea_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.teacher), :width => "50", :height => "50"), user_url_in_org(activity.tea_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.teacher} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:teacher).try(:realname) == ' ' %>
-            <%= link_to activity.try(:teacher), user_path(activity.tea_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:teacher), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:teacher).try(:realname), user_path(activity.tea_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:teacher).try(:realname), user_url_in_org(activity.tea_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.name.to_s+" | 课程", course_path(activity.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 0e056c972..0dd9fb725 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -2,15 +2,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_url_in_org(activity.user_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:user).try(:realname) == ' ' %>
-            <%= link_to activity.try(:user), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", homework_common_index_path(:course => activity.course.id, :host=> Setting.host_course), :class => "newsBlue ml15"%>
       </div>
@@ -303,14 +303,14 @@
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_path(comment.user_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33", :class =>"mt8"), user_url_in_org(comment.user_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher">
                       <% if comment.try(:user).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:user), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:user), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:user).try(:realname), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 7eee53d02..99229634e 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id,:host=>Setting.host_user), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.course.name.to_s+" | 课程问答区", course_boards_path(activity.course,:host=> Setting.host_course), :class => "newsBlue ml15 mr5"%>
@@ -105,14 +105,14 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id,:host=>Setting.host_user), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -136,7 +136,7 @@
 
     <% if !activity.locked? && authorize_for_course('messages', 'reply') %>
         <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+          <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
           <div class="homepagePostReplyInputContainer  mb10">
             <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
               <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index 665f5c1ae..ecdf728f8 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if @ctivity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO  <!--+"(课程名称)"-->
         <%= link_to activity.course.name.to_s+" | 课程通知", course_news_index_path(activity.course), :class => "newsBlue ml15" %>
       </div>
@@ -74,14 +74,14 @@
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
@@ -103,7 +103,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_course_poll.html.erb b/app/views/organizations/_org_course_poll.html.erb
index 7e09e2215..c124e829f 100644
--- a/app/views/organizations/_org_course_poll.html.erb
+++ b/app/views/organizations/_org_course_poll.html.erb
@@ -5,15 +5,15 @@
       <div class="homepagePostBrief">
         <div class="homepagePostPortrait">
           <!-- <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a>-->
-          <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_path(activity.user_id), :alt => "用户头像" %>
+          <%= link_to image_tag(url_to_avatar(activity.user), :width => "50", :height => "50"), user_url_in_org(activity.user_id), :alt => "用户头像" %>
           <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.user} %>
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word mt-4">
             <% if activity.try(:user).try(:realname) == ' ' %>
-                <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
+                <%= link_to activity.try(:user), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
             <% else %>
-                <%= link_to activity.try(:user).try(:realname), user_path(activity.user_id), :class => "newsBlue mr15" %>
+                <%= link_to activity.try(:user).try(:realname), user_url_in_org(activity.user_id), :class => "newsBlue mr15" %>
             <% end %>
             TO
             <%= link_to Course.find(activity.polls_group_id).name.to_s+" | 问卷", poll_index_path(:polls_type => "Course", :polls_group_id => activity.polls_group_id), :class => "newsBlue ml15" %>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 2495e0044..855a8053c 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>  TO
         <%=  link_to activity.project.name.to_s+" | 项目问题", project_issues_path(activity.project), :class => "newsBlue ml15"%>
       </div>
@@ -23,9 +23,9 @@
         <div class="homepagePostAssignTo">指派给&nbsp;&nbsp;
           <% unless activity.assigned_to_id.nil? %>
               <% if activity.try(:assigned_to).try(:realname) == ' ' %>
-                  <%= link_to activity.try(:assigned_to), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+                  <%= link_to activity.try(:assigned_to), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
               <% else %>
-                  <%= link_to activity.try(:assigned_to).try(:realname), user_path(activity.assigned_to_id), :class => "newsBlue mr15" %>
+                  <%= link_to activity.try(:assigned_to).try(:realname), user_url_in_org(activity.assigned_to_id), :class => "newsBlue mr15" %>
               <% end %>
           <% end %>
         </div>
@@ -85,14 +85,14 @@
                 <% replies_all_i=replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_url_in_org(reply.user_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:user).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:user), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:user).try(:realname), user_url_in_org(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -120,7 +120,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  add_journal_in_org_issue_path(activity.id),:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 55f03a367..aa2493c5f 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",organization_path(activity.board.org_subfield.organization, :org_subfield_id => activity.board.org_subfield.id), :class => "newsBlue ml15 mr5"%>
@@ -110,14 +110,14 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -139,7 +139,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 891ad14a7..edbdfa16b 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %> TO  <!--+"(课程名称)"-->
         <%= link_to activity.org_subfield.name.to_s+" | 帖子栏目通知", organization_path(activity.org_subfield.organization, :org_subfield_id => activity.org_subfield.id), :class => "newsBlue ml15" %>
       </div>
@@ -94,14 +94,14 @@
                 <% replies_all_i = replies_all_i + 1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i > 3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_path(comment.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(comment.author), :width => "33", :height => "33"), user_url_in_org(comment.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if comment.try(:author).try(:realname) == ' ' %>
-                          <%= link_to comment.try(:author), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to comment.try(:author).try(:realname), user_url_in_org(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
                       <span id="reply_praise_count_<%=comment.id %>">
@@ -123,7 +123,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_project_create.html.erb b/app/views/organizations/_project_create.html.erb
index b68b7ceeb..e13f4128b 100644
--- a/app/views/organizations/_project_create.html.erb
+++ b/app/views/organizations/_project_create.html.erb
@@ -3,15 +3,15 @@
 <div class="resources mt10">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if user.try(:realname) == ' ' %>
-            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
+            <%= link_to user, user_url_in_org(user), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
+            <%= link_to user.try(:realname), user_url_in_org(user), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to project.to_s+" | 项目", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 6cc3f5740..3b459f366 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -1,15 +1,15 @@
 <div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
+      <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_url_in_org(activity.author_id), :alt => "用户头像" %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => activity.author} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo break_word mt-4">
         <% if activity.try(:author).try(:realname) == ' ' %>
-            <%= link_to activity.try(:author), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% else %>
-            <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
+            <%= link_to activity.try(:author).try(:realname), user_url_in_org(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
         <%= link_to activity.project.name.to_s+" | 项目讨论区",project_boards_path(activity.project), :class => "newsBlue ml15 mr5"%>
@@ -85,14 +85,14 @@
                 <% replies_all_i=replies_all_i+1 %>
                 <li class="homepagePostReplyContainer" nhname="reply_rec" style="display:<%= replies_all_i>3 ? 'none' : '' %>">
                   <div class="homepagePostReplyPortrait">
-                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_path(reply.author_id), :alt => "用户头像" %>
+                    <%= link_to image_tag(url_to_avatar(reply.author), :width => "33", :height => "33"), user_url_in_org(reply.author_id), :alt => "用户头像" %>
                   </div>
                   <div class="homepagePostReplyDes">
                     <div class="homepagePostReplyPublisher mt-4">
                       <% if reply.try(:author).try(:realname) == ' ' %>
-                          <%= link_to reply.try(:author), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% else %>
-                          <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
+                          <%= link_to reply.try(:author).try(:realname), user_url_in_org(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
                       <span id="reply_praise_count_<%=reply.id %>">
@@ -114,7 +114,7 @@
     <% end %>
 
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_url_in_org(activity.author_id), :alt => "用户头像" %></div>
       <div class="homepagePostReplyInputContainer mb10">
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index da458636a..2584e4209 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -1,12 +1,12 @@
 <div class="resources mt10" id="organization_document_<%= document.id %>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
-      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_path(document.creator_id) %>
+      <%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>
       <%= render :partial => 'users/show_detail_info', :locals => {:user => User.find(document.creator_id)} %>
     </div>
     <div class="homepagePostDes">
       <div class="homepagePostTo">
-        <%= link_to User.find(document.creator_id), user_path(document.creator.id), :class => "newsBlue mr15" %>
+        <%= link_to User.find(document.creator_id), user_url_in_org(document.creator.id), :class => "newsBlue mr15" %>
         TO&nbsp;&nbsp;<%= link_to document.organization.name, organization_path(document.organization), :class => "newsBlue" %>
         |
             <span style="color:#269ac9;"><%= document.org_subfield_id.nil? ? "组织文章" :"#{OrgSubfield.find(document.org_subfield_id).name}" %></span>
@@ -87,10 +87,10 @@
         <% comments_for_doc.each do |comment| %>
             <% reply_id += 1 %>
             <li style="display:<%= reply_id > 3 ? 'none' : '' %>">
-              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_path(comment.creator_id) %></div>
+              <div class="homepagePostReplyPortrait"><%= link_to image_tag(url_to_avatar(User.find(comment.creator_id)), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_id) %></div>
               <div class="homepagePostReplyDes">
                 <div class="homepagePostReplyPublisher">
-                  <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %>
+                  <%= link_to User.find(comment.creator_id), user_url_in_org(comment.creator_id), :class => "newsBlue mr10 f14" %>
                   <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
                   <span id="reply_praise_count_<%=comment.id %>">
                           <% if comment.creator_id.to_i == User.current.id.to_i %>
@@ -111,7 +111,7 @@
     </div>
     <div class="homepagePostReplyContainer borderBottomNone minHeight48">
       <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= act.id %>">
-        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_path(User.current) %>
+        <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33", :alt => "用户头像"), user_url_in_org(User.current) %>
       </div>
       <div class="homepagePostReplyInputContainer">
         <div nhname='new_message_<%= act.id %>' style="display:none;">
diff --git a/app/views/users/_show_detail_info.html.erb b/app/views/users/_show_detail_info.html.erb
index 9de431336..f2a2faeb3 100644
--- a/app/views/users/_show_detail_info.html.erb
+++ b/app/views/users/_show_detail_info.html.erb
@@ -1,6 +1,6 @@
 <div class="userCard boxShadow" style="<%= User.current == user ? 'top:-153px;':'' %>">
   <div class="userAvatarWrap fl">
-    <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像", :target => '_blank' %>
+    <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_url_in_org(user), :alt => "用户头像", :target => '_blank' %>
     <%#= image_tag(url_to_avatar(user), :width => "50", :height => "50") %>
     <!--<img src="images/homepageImage.jpg" width="50" height="50" alt="个人头像"  />-->
   </div>

From 6e21229b4c09396867f704dc9f03df35d056ccfb Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 8 Mar 2016 15:22:56 +0800
Subject: [PATCH 06/32] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 71e19375f..c19c44935 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2900,7 +2900,7 @@ def user_url_in_org(user_id)
   if Rails.env.development?
     return "http://localhost:3000/users/" + user_id.to_s
   elsif Rails.env.test?
-    return "https://www.test.forge.net/users/" + user_id.to_s
+    return "https://www.test.forge.trustie.net/users/" + user_id.to_s
   else
     return "https://www.trustie.net/users/" + user_id.to_s
   end

From 141c0be24f2d839dfe13cf7b4d0fcc672456902d Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 8 Mar 2016 15:50:01 +0800
Subject: [PATCH 07/32] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=A0=B7=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/users/_upload_resource.html.erb    | 4 ++--
 app/views/users/_user_resource_info.html.erb | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_upload_resource.html.erb b/app/views/users/_upload_resource.html.erb
index b72ec880b..1e691c3b7 100644
--- a/app/views/users/_upload_resource.html.erb
+++ b/app/views/users/_upload_resource.html.erb
@@ -37,8 +37,8 @@
 
         </div>
         <div class="uploadResourceIntr">
-          <div class="uploadResourceName"><span id="upload_file_count">(未选择文件)</span></div>
-          <div class="uploadResourceIntr2"><!--您可以上传小于<span class="c_red">50MB</span>的文件--></div>
+          <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
+          <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
         </div>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index cafbf457f..6eddf1e05 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -3,7 +3,6 @@
   <div id="search_div">
     <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type} %>
   </div>
-  <div style="float: left; margin-top: 7px; font-size: 14px; margin-left: 15px;"><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count %></span>个资源</span></div>
 </div>
 <div class="cl"></div>
 <ul class="resource-list-tab mt10">

From f469e51202d7ab698d6492f13e26d57c4ddd217c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 8 Mar 2016 17:38:38 +0800
Subject: [PATCH 08/32] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=A8=A1=E5=9D=97/?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E3=80=81=E4=BD=9C=E4=B8=9A=E3=80=81=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E3=80=81=E5=8F=91=E5=B8=96=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E7=BB=9F=E8=AE=A1=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E9=80=92=E5=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/files_controller.rb     | 15 +----
 app/helpers/application_helper.rb       | 88 +++++++++++++++++++------
 app/models/attachment.rb                |  9 ++-
 app/models/comment.rb                   |  8 +++
 app/models/journals_for_message.rb      | 14 +++-
 app/models/message.rb                   | 14 +++-
 app/models/news.rb                      | 10 ++-
 app/views/layouts/base_courses.html.erb |  4 +-
 db/schema.rb                            |  1 -
 9 files changed, 121 insertions(+), 42 deletions(-)

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index a40b24fe2..8fab53206 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -555,7 +555,8 @@ class FilesController < ApplicationController
          end
        end
        # 更新课程英雄榜得分
-       update_contributor_score(@course, attachments[:files].first)
+       course_member_score(@course.id, attachments[:files].first.author_id, "Attachment")
+       # end
        # end
        # TODO: 临时用 nyan
        sort_init 'created_on', 'desc'
@@ -628,18 +629,6 @@ class FilesController < ApplicationController
    end
   end
 
-  def update_contributor_score(course, file )
-    course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course.id,  file.author.id).first
-    if  course_contributor_score.nil?
-      CourseContributorScore.create(:course_id => course.id, :user_id => file.author.id, :message_num => 0, :message_reply_num => 0,
-                                    :news_reply_num => 0, :resource_num => 5, :journal_num => 0, :journal_reply_num => 0, :total_score => 5)
-    else
-      score = course_contributor_score.resource_num + 5
-      total_score = course_contributor_score.total_score + 5
-      course_contributor_score.update_attributes(:resource_num => score, :total_score => total_score)
-    end
-  end
-
   def get_project_tag_name_by_type_nmuber type
     case type
       when "1"
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 22890fd9a..b7a2e3bd8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -117,56 +117,102 @@ module ApplicationHelper
       when "HomeworkCommon"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1 , :total_score => 1)
+                                        :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :homework_journal_num => 1)
         else
           score = course_contributor_score.homework_journal_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:homework_journal_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:homework_journal_num => score)
         end
-      when "JournalForMessage"
+      # 课程留言
+      when "Course"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0, :total_score => 1)
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 1, :journal_reply_num => 0)
         else
           score = course_contributor_score.journal_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:journal_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:journal_num => score)
         end
       when  "Message"
         if  course_contributor_score.nil?
-          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 2, :message_reply_num => 0,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 2)
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1, :message_reply_num => 0,
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
-          score = course_contributor_score.message_num + 2
-          total_score = course_contributor_score.total_score + 2
-          course_contributor_score.update_attributes(:message_num => score, :total_score => total_score)
+          score = course_contributor_score.message_num + 1
+          course_contributor_score.update_attributes(:message_num => score)
         end
       when "MessageReply"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 1,
-                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+                                            :news_reply_num => 0, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
           score = course_contributor_score.message_reply_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:message_reply_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:message_reply_num => score)
         end
       when "NewReply"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+                                            :news_reply_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
           score = course_contributor_score.news_reply_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:news_reply_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:news_reply_num => score)
         end
       when "News"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
-                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0, :total_score => 1)
+                                        :news_reply_num => 0, :news_num => 1, :resource_num => 0, :journal_num => 0, :journal_reply_num => 0)
         else
           score = course_contributor_score.news_num + 1
-          total_score = course_contributor_score.total_score + 1
-          course_contributor_score.update_attributes(:news_num => score, :total_score => total_score)
+          course_contributor_score.update_attributes(:news_num => score)
+        end
+      when "Attachment"
+        if  course_contributor_score.nil?
+          CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 0, :message_reply_num => 0,
+                                        :news_reply_num => 0, :news_num => 0, :resource_num => 1, :journal_num => 0, :journal_reply_num => 0)
+        else
+          score = course_contributor_score.resource_num + 1
+          course_contributor_score.update_attributes(:resource_num => score)
+        end
+    end
+  end
+
+  # 删除某条记录相应减少课程统计数
+  def down_course_score_num (course_id,user_id,type)
+    course_contributor_score = CourseContributorScore.where("course_id =? and user_id =?", course_id, user_id).first
+    case type
+      when "HomeworkCommon"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.homework_journal_num - 1
+          course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score)
+        end
+      # 课程留言
+      when "Course"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.journal_num - 1
+          course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score)
+        end
+      when  "Message"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.message_num - 1
+          course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score)
+        end
+      when "MessageReply"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.message_reply_num - 1
+          course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score)
+        end
+      when "NewReply"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.news_reply_num - 1
+          course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score)
+        end
+      when "News"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.news_num - 1
+          course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score)
+        end
+      when "Attachment"
+        unless  course_contributor_score.nil?
+          score = course_contributor_score.resource_num - 1
+          course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score)
         end
     end
   end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 82f648ad9..9f0c2c559 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -43,6 +43,7 @@ class Attachment < ActiveRecord::Base
 
   #elasticsearch
   include Elasticsearch::Model
+  include ApplicationHelper
   #elasticsearch kaminari init
   Kaminari::Hooks.init
   Elasticsearch::Model::Response::Response.__send__ :include, Elasticsearch::Model::Response::Pagination::Kaminari
@@ -92,7 +93,7 @@ class Attachment < ActiveRecord::Base
   after_save :act_as_course_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
-  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count
+  after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count, :down_course_score
 
   # add by nwb
   # 获取所有可公开的资源文件列表
@@ -655,6 +656,12 @@ class Attachment < ActiveRecord::Base
       self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
+
+  def down_course_score
+    if self.container_type == "Course"
+      down_course_score_num(self.container_id, self.author_id, "Attachment")
+    end
+  end
 end
 
 # Delete the previous articles index in Elasticsearch
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 4d7af1d73..b87203a50 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -36,6 +36,7 @@ class Comment < ActiveRecord::Base
   validates_presence_of :commented, :author, :comments
   safe_attributes 'comments'
   after_create :send_mail, :act_as_system_message, :act_as_student_score
+  after_destroy :down_course_score
 
   def act_as_system_message
     if self.commented.course
@@ -86,4 +87,11 @@ class Comment < ActiveRecord::Base
     end
   end
 
+  # 课程新闻数减少
+  def down_course_score
+    if self.commented.course
+      down_course_score_num(self.commented.course.id, self.author_id, "NewReply")
+    end
+  end
+
 end
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 7990979e4..dae779b65 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -73,7 +73,7 @@ class JournalsForMessage < ActiveRecord::Base
   #after_update :update_activity
   after_destroy :reset_counters!
   after_save :be_user_score
-  after_destroy :down_user_score
+  after_destroy :down_user_score, :down_course_score
 
   # default_scope { where('m_parent_id IS NULL') }
 
@@ -184,6 +184,7 @@ class JournalsForMessage < ActiveRecord::Base
       end
     end
   end
+
   # 更新用户分数     -by zjc
   def down_user_score
     #删除了留言回复
@@ -286,10 +287,19 @@ class JournalsForMessage < ActiveRecord::Base
   # 课程成员得分（活跃度）
   def act_as_student_score
     if self.jour_type == "Course"
-      course_member_score(self.jour_id, self.user_id, "JournalForMessage")
+      course_member_score(self.jour_id, self.user_id, "Course")
     elsif self.jour_type == "HomeworkCommon"
       course_member_score(self.jour.course_id, self.user_id, "HomeworkCommon")
     end
   end
 
+  # 删除操作的时候相应扣掉回复数
+  def down_course_score
+    if self.jour_type == "Course"
+      down_course_score_num(self.jour_id, self.user_id, "Course")
+    elsif self.jour_type == "HomeworkCommon"
+      down_course_score_num(self.jour.course_id, self.user_id, "HomeworkCommon")
+    end
+  end
+
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 44f2d2c80..0ddc6f8e0 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -79,7 +79,7 @@ class Message < ActiveRecord::Base
 
   after_create :add_author_as_watcher, :reset_counters!, :add_boards_count
   after_update :update_messages_board, :update_activity
-  after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count
+  after_destroy :reset_counters!,:down_user_score,:delete_kindeditor_assets, :decrease_boards_count, :down_course_score
   
   after_create :act_as_activity,:act_as_course_activity,:be_user_score,:act_as_forge_activity, :act_as_system_message, :send_mail, :act_as_student_score, :act_as_at_message
   #before_save :be_user_score
@@ -354,6 +354,18 @@ class Message < ActiveRecord::Base
     end
   end
 
+  # 删除帖子的时候更新课程帖子总数, 删除回复的时候减少总数
+  def down_course_score
+    if self.course
+      if self.parent_id.nil?  # 发帖
+        down_course_score_num(self.course.id, self.author_id, "Message")
+      else
+        # 回帖
+        down_course_score_num(self.course.id, self.author_id, "MessageReply")
+      end
+    end
+  end
+
   def delete_org_activities
     OrgActivity.where("org_act_type='Message' and org_act_id =#{self.id} and container_type='OrgSubfield'").destroy_all
   end
diff --git a/app/models/news.rb b/app/models/news.rb
index 028b6d737..6746d90cd 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -61,7 +61,7 @@ class News < ActiveRecord::Base
 
   after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score
   after_update :update_activity
-  after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities
+  after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score
 
   scope :visible, lambda {|*args|
     includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
@@ -195,10 +195,18 @@ class News < ActiveRecord::Base
     OrgActivity.where("container_type='OrgSubfield' and org_act_type='News' and org_act_id=?", self.id).destroy_all
   end
 
+  # 新增新闻统计数增加
   def act_as_student_score
     if self.course
       course_member_score(self.course.id, self.author_id, "News")
     end
   end
 
+  # 删除新闻统计数减少
+  def down_course_score
+    if self.course
+      down_course_score_num(self.course.id, self.author_id, "News")
+    end
+  end
+
 end
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 2a44f2980..90c90e48d 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -163,8 +163,8 @@
                   + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
                   contributor_score.news_num.to_i * 1 %>
           <% unless total_score ==0 %>
-            <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %></a>
-              <p><a href="javascript:void:(0);"><%=link_to contributor_score.user.show_name, user_path(contributor_score.user), :title => contributor_score.user.show_name %></a></p>
+            <li><%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(contributor_score.user) %>
+              <p><%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %></p>
               <p><span class="c_green" style="cursor:pointer">
                 <a onmouseover ="message_titile_show($(this),event)" onmouseout ="message_titile_hide($(this))" class="c_green">
                   <%=total_score %></a></span></p>
diff --git a/db/schema.rb b/db/schema.rb
index 76dd8e19c..a7ffc23b1 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1387,7 +1387,6 @@ ActiveRecord::Schema.define(:version => 20160304234903) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end

From 1cccf79bd81596b352e522c5b2632a95ba555db1 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 9 Mar 2016 09:20:53 +0800
Subject: [PATCH 09/32] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=9A=84=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 2 +-
 public/stylesheets/public.css   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a923ae86f..620feaeac 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -692,7 +692,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
 .homepagePostSetting ul li:hover ul {display:block;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
-.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
+.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 707d661ea..5a9593519 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -615,7 +615,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:690px; margin:0px auto; margin-top:15px; min-height:60px;}
 .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
 .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
-.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
+.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 .whiteSettingIcon {background:url(../images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}

From d6d8e231e6e4cfc12c4296358c3201fa3f5a149f Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Wed, 9 Mar 2016 09:46:07 +0800
Subject: [PATCH 10/32] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=8E=A8=E8=8D=90?=
 =?UTF-8?q?=E5=9C=A8ie=E4=B8=AD=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_recommendation.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/courses/_recommendation.html.erb b/app/views/courses/_recommendation.html.erb
index f26c5fd41..f697383ca 100644
--- a/app/views/courses/_recommendation.html.erb
+++ b/app/views/courses/_recommendation.html.erb
@@ -6,7 +6,7 @@
 
           <li class="mt15"> <%= image_tag(url_to_avatar(e_course), :width => "40", :height => "40", :class => "fl mr10 rankPortrait", :alt => "logo") %>
             <div class="fl">
-              <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %></p>
+              <p class="f12 mb5"><%=link_to e_course.name, course_path(e_course.id), :class => "hidden fl w170" %><div class="cl"></div> </p>
               <p class="f12">
                 <% if e_course.attachments.count > 0 %>
                     <span class="fl mr15 fontGrey4"><%= l(:project_module_attachments) %>(<%= link_to e_course.attachments.count, course_files_path(e_course), :class => "linkBlue2" %>)</span>
@@ -14,6 +14,7 @@
                 <% if e_course.homework_commons.count > 0 %>
                     <span class="fl fontGrey4"><%= l(:label_homework_commont) %>(<%= link_to e_course.homework_commons.count, homework_common_index_path(:course=>e_course.id), :class => "linkBlue2" %>)</span>
                 <% end %>
+                <div class="cl"></div>
               </p>
             </div>
             <div class="cl"></div>

From d3489ec5cbd5bf953dfb6ed5a544aed4f0973f21 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 9 Mar 2016 11:15:43 +0800
Subject: [PATCH 11/32] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E4=BD=9C=E5=93=81=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E3=80=81=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8A=A0=E5=88=B0=E5=8A=A8=E6=80=81=E7=9A=84?=
 =?UTF-8?q?=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_common_controller.rb  |  4 ++--
 app/controllers/student_work_controller.rb     |  5 +++++
 app/controllers/users_controller.rb            |  6 ++++++
 app/controllers/words_controller.rb            |  2 +-
 ...024051_update_homework_common_updated_at.rb | 18 ++++++++++++++++++
 db/schema.rb                                   |  3 ++-
 6 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20160309024051_update_homework_common_updated_at.rb

diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb
index 00b11323b..ba6c136bb 100644
--- a/app/controllers/homework_common_controller.rb
+++ b/app/controllers/homework_common_controller.rb
@@ -17,9 +17,9 @@ class HomeworkCommonController < ApplicationController
     @page = params[:page] ? params[:page].to_i + 1 : 0
     @is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course))
     if @is_teacher
-      @homeworks = @course.homework_commons.order("created_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.order("updated_at desc").limit(10).offset(@page * 10)
     else
-      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("created_at desc").limit(10).offset(@page * 10)
+      @homeworks = @course.homework_commons.where("publish_time <= '#{Date.today}'").order("updated_at desc").limit(10).offset(@page * 10)
     end
     @is_student = User.current.logged? && (User.current.admin? || (User.current.member_of_course?(@course) && !@is_teacher))
     @is_new = params[:is_new]
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index a38d83851..0c8bb6c01 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -303,6 +303,7 @@ class StudentWorkController < ApplicationController
             stu_project.save
           end
         end
+        @homework.update_attributes(:updated_at => Time.now)
         update_course_activity(@homework.class,@homework.id)
         update_user_activity(@homework.class,@homework.id)
         update_org_activity(@homework.class,@homework.id)
@@ -500,6 +501,10 @@ class StudentWorkController < ApplicationController
         when 3 #学生评分 学生评分显示平均分
           @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
       end
+      @homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(@homework.class,@homework.id)
+      update_user_activity(@homework.class,@homework.id)
+      update_org_activity(@homework.class,@homework.id)
       if @work.save
         respond_to do |format|
           format.js
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 921262106..ea984aa80 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -58,6 +58,7 @@ class UsersController < ApplicationController
   helper :sort
   helper :attachments
   include SortHelper
+  include ApplicationHelper
   helper :custom_fields
   include CustomFieldsHelper
   include AvatarHelper
@@ -690,6 +691,11 @@ class UsersController < ApplicationController
       end
 
       student_work.save
+      homework.update_attributes(:updated_at => Time.now)
+      update_course_activity(homework.class,homework.id)
+      update_user_activity(homework.class,homework.id)
+      update_org_activity(homework.class,homework.id)
+
       flash[:notice] = l(:notice_successful_create)
       redirect_to student_work_index_url(:homework => params[:homework])
     else
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
index d1aa67483..e6d1d9117 100644
--- a/app/controllers/words_controller.rb
+++ b/app/controllers/words_controller.rb
@@ -276,7 +276,7 @@ class WordsController < ApplicationController
             ids = params[:asset_id].split(',')
             update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
           end
-
+          @homework_common.update_attributes(:updated_at => Time.now)
           update_course_activity(@homework_common.class,@homework_common.id)
           update_user_activity(@homework_common.class,@homework_common.id)
           update_org_activity(@homework_common.class,@homework_common.id)
diff --git a/db/migrate/20160309024051_update_homework_common_updated_at.rb b/db/migrate/20160309024051_update_homework_common_updated_at.rb
new file mode 100644
index 000000000..89a0e992d
--- /dev/null
+++ b/db/migrate/20160309024051_update_homework_common_updated_at.rb
@@ -0,0 +1,18 @@
+class UpdateHomeworkCommonUpdatedAt < ActiveRecord::Migration
+  def up
+    count = HomeworkCommon.all.count / 30 + 2
+    transaction do
+      for i in 1 ... count do i
+        HomeworkCommon.page(i).per(30).each do |hw|
+          ca = CourseActivity.where("course_act_type = 'HomeworkCommon' and course_act_id = #{hw.id}").first
+          unless ca.nil?
+            hw.update_attributes(:updated_at => ca.updated_at)
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a7ffc23b1..5bc8b1ea0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160304234903) do
+ActiveRecord::Schema.define(:version => 20160309024051) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1387,6 +1387,7 @@ ActiveRecord::Schema.define(:version => 20160304234903) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
+    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end

From 99be187d544e1a4e3f979288e66490c4a5594550 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 11:30:28 +0800
Subject: [PATCH 12/32] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=20=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=A2=84=E8=A7=88=E7=9A=84=E6=96=87=E4=BB=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BE=9B=E7=9B=B4=E6=8E=A5=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f7845d6f1..e49c5a696 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -431,7 +431,10 @@ update
 
   def entry
     entry_and_raw(false)
-    render :layout => 'base_projects'
+    @content = @repository.cat(@path, @rev)
+    if is_entry_text_data?(@content, @path)
+      render :layout => 'base_projects'
+    end
   end
 
   def entry_and_raw(is_raw)
@@ -443,9 +446,7 @@ update
 
     @content = @repository.cat(@path, @rev)
     (show_error_not_found; return) unless @content
-    if is_raw ||
-        (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) ||
-        ! is_entry_text_data?(@content, @path)
+    if is_raw || (@content.size && @content.size > Setting.file_max_size_displayed.to_i.kilobyte) || !is_entry_text_data?(@content, @path)
       # Force the download
       send_opt = { :filename => filename_for_content_disposition(@path.split('/').last) }
       send_type = Redmine::MimeType.of(@path)

From 84d7049add1674395323513b172e744f34e57909 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 13:17:37 +0800
Subject: [PATCH 13/32] =?UTF-8?q?fork=E5=BC=B9=E5=87=BA=E6=96=B0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=97=B4=E6=8E=A5=E6=80=A7?=
 =?UTF-8?q?500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb     | 1 +
 app/controllers/repositories_controller.rb | 2 +-
 app/views/repositories/show.html.erb       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b650afe1b..3d5030c29 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -406,6 +406,7 @@ class ProjectsController < ApplicationController
       end
       flash.now[:error] = html if !html.to_s.blank?
     end
+    # for：设置默认分支
     scm = params[:repository_scm] || (Redmine::Scm::Base.all & Setting.enabled_scm).first
     @repository = Repository.factory(scm)
     @repository.is_default = @project.repository.nil?
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index e49c5a696..9bb6055ee 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -140,7 +140,7 @@ class RepositoriesController < ApplicationController
             attrs = {:parent_id => project.parent_id}.reject {|k,v| v.nil?}
             redirect_to new_project_url(attrs, :course => '0')
           else
-            redirect_to settings_project_url(project)
+            redirect_to project_path(project)
           end
         }
         format.api  { render :action => 'show', :status => :created, :location => url_for(:controller => 'projects', :action => 'show', :id => project.id) }
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 76d5745df..51918d2d7 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -27,7 +27,7 @@
       <div class="fl mt5 ml15"><a href="javascript:void(0);" class="vl_btn fb" onclick="zip()"><span class="vl_zip"></span>ZIP</a> </div>
       <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
       <% if User.current.id != @project.user_id %>
-          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
+          <div class="fr mt5"><%= link_to "<span class='vl_fork'></span>".html_safe+"Fork", {:controller => 'repositories', :action => 'forked'}, :class=>"vl_btn", :target => "_blank", :confirm=>"平台将为您创建一个新的同名项目和版本库，请问是否继续？" %>
             <span href="javascript:void(0);" class="vl_btn_2 fb"><%= @project.forked_count.to_i %></span>
           </div>
       <% end %>

From b4800585e7b82ba514dbbaa2b1a93440780c7100 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 15:24:02 +0800
Subject: [PATCH 14/32] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF=20?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_at_message.html.erb     | 2 +-
 app/views/users/_user_message_course.html.erb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index f174e8513..c4a257358 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -5,7 +5,7 @@
             <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.subject.html_safe, ma.url,
+            <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course, :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
                         :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
                         :onmouseover =>"message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %></li>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 9f7b90ee4..ff91375c8 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -246,7 +246,8 @@
     <% if ma.course_message_type == "Message" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
+          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+            <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
           <% if ma.course_message.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
                 <%= link_to ma.course_message.subject, course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),

From d3fd44510803967356d6e6c5255ef5a5b588d237 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 15:27:50 +0800
Subject: [PATCH 15/32] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...9072649_update_contributor_after_delete.rb | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 db/migrate/20160309072649_update_contributor_after_delete.rb

diff --git a/db/migrate/20160309072649_update_contributor_after_delete.rb b/db/migrate/20160309072649_update_contributor_after_delete.rb
new file mode 100644
index 000000000..33d89b113
--- /dev/null
+++ b/db/migrate/20160309072649_update_contributor_after_delete.rb
@@ -0,0 +1,50 @@
+class UpdateContributorAfterDelete < ActiveRecord::Migration
+  def up
+    Course.all.each do |course|
+      if course.course_activities.count > 1
+        course.members.each do |s|
+          puts course.id
+          puts course.name
+          puts s.user_id
+          # board_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?",s.student_id, course.id, "Message").count * 2
+          # 发帖数
+          board_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is null;").count
+          # 回帖数
+          message_reply_count = Message.find_by_sql("select DISTINCT me.* from messages me, boards b where b.id = me.board_id and b.course_id = #{course.id} and b.project_id = '-1' and me.author_id = #{s.user_id} and me.parent_id is not null").count * 1
+          # 新闻回复
+          common_reply_count = Comment.find_by_sql("select cm.* from comments cm, news n where cm.author_id = #{s.user_id} and n.course_id = #{course.id} and cm.commented_id = n.id and cm.commented_type ='News'").count * 1
+          # 通知
+          common_count = News.find_by_sql("select n.* from news n where n.author_id = #{s.user_id} and n.course_id = #{course.id} ").count * 1
+          # attachment_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "Attachment").count * 5
+          # 附件数
+          attachment_count = Attachment.find_by_sql("SELECT * FROM `attachments` where container_id = #{course.id} and author_id = #{s.user_id} and container_type ='Course'").count
+          # 课程留言数
+          journal_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? ", s.user_id, course.id, "Course").count * 1
+          # 作业留言
+          journal_homework_count = JournalsForMessage.find_by_sql("SELECT jfm.* FROM `journals_for_messages` jfm, homework_commons hc where hc.id = jfm.jour_id and hc.course_id =#{course.id} and jfm.user_id =#{s.user_id} and jfm.jour_type ='HomeworkCommon';").count * 1
+          # journal_count = CourseActivity.where("user_id =? and course_id =? and course_act_type =?", s.student_id, course.id, "JournalsForMessage").count * 1
+          # journal_reply_count = JournalsForMessage.where("user_id =? and jour_id =? and jour_type =? and status =?", s.student_id, course.id, "Course",1).count * 1
+          total =   board_count + message_reply_count + common_reply_count + attachment_count + journal_count
+          course_contributor = CourseContributorScore.where("course_id =? and user_id =?", course.id, s.user_id).first
+          if course_contributor.nil?
+            CourseContributorScore.create(:course_id => course.id, :user_id => s.user_id, :message_num => board_count, :message_reply_num => message_reply_count,
+                                          :news_reply_num => common_reply_count, :news_num => common_count, :resource_num => attachment_count, :journal_num => journal_count,
+                                          :homework_journal_num => journal_homework_count, :journal_reply_num => 0, :total_score => total)
+          else
+            course_contributor.message_num = board_count
+            course_contributor.message_reply_num = message_reply_count
+            course_contributor.news_reply_num = common_reply_count
+            course_contributor.news_num = common_count
+            course_contributor.resource_num = attachment_count
+            course_contributor.journal_num = journal_count
+            course_contributor.homework_journal_num = journal_homework_count
+            course_contributor.save
+          end
+        end
+      end
+    end
+  end
+
+  def down
+  end
+end

From 5a4f422b1cce2804d4b9299bca6fc73b20d2b94a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 16:44:11 +0800
Subject: [PATCH 16/32] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_at_message.html.erb     | 14 ++++++++++----
 app/views/users/_user_message_course.html.erb |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index c4a257358..dd5ffbe56 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -5,10 +5,16 @@
             <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course, :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
-                        :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
-                        :onmouseover =>"message_titile_show($(this),event)",
-                        :onmouseout => "message_titile_hide($(this))" %></li>
+            <% if ma.at_message_type == "Message" %>
+                <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
+                                                                     :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %>
+            <% else %>
+                <%= link_to ma.subject.html_safe, ma.url, :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
+            <% end %>
+            </li>
           <div  style="display: none" class="message_title_red system_message_style">
             <p><strong>标题：</strong><%= ma.subject %></p>
             <% unless ma.description.nil? %>
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index ff91375c8..bb9fc1174 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -246,7 +246,8 @@
     <% if ma.course_message_type == "Message" %>
         <ul class="homepageNewsList fl">
           <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %></a></li>
-          <li class="homepageNewsPubType fl"><%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+          <li class="homepageNewsPubType fl">
+            <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
             <%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %></span></li>
           <% if ma.course_message.parent_id.nil? %>
               <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">

From 3d2ba83c366ab151e59ec6d96980d91dfc31ada2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 17:22:16 +0800
Subject: [PATCH 17/32] =?UTF-8?q?@=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_at_message.html.erb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index dd5ffbe56..343741cd4 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -5,9 +5,15 @@
             <span class="newsBlue homepageNewsPublisher"><%= ma.author.login %></span><span class="homepageNewsType fl">提到了你：</span>
           </li>
           <li class="homepageNewsContent fl">
-            <% if ma.at_message_type == "Message" %>
+            <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
                 <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
-                                                                     :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+                            :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
+                            :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                            :onmouseover =>"message_titile_show($(this),event)",
+                            :onmouseout => "message_titile_hide($(this))" %>
+            <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+                <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
+                            :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id, :topic_id => ma.at_message.id),
                             :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
                             :onmouseover =>"message_titile_show($(this),event)",
                             :onmouseout => "message_titile_hide($(this))" %>

From a6c7766b00b4eacc51c96f1021c97e3ee884e887 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 9 Mar 2016 18:06:26 +0800
Subject: [PATCH 18/32] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8D=E8=83=BD=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/trustie/gitlab/helper.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/trustie/gitlab/helper.rb b/lib/trustie/gitlab/helper.rb
index 9fb1f5735..54bc4620e 100644
--- a/lib/trustie/gitlab/helper.rb
+++ b/lib/trustie/gitlab/helper.rb
@@ -40,6 +40,11 @@ module Trustie
                                    username: user.login,
                                    confirm: "true")
             user.gid = u.id
+            user.save
+          end
+          if user.gid.nil?
+            user.gid = u.id
+            user.save
           end
           change_password(u.id, user.hashed_password, user.salt)
         rescue => e

From 5b4ff5ec8ac56c8b28e7bb7c711cdd2b918dd710 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 09:22:49 +0800
Subject: [PATCH 19/32] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BD=9C=E4=B8=9A=E7=A7=AF=E5=88=86=E4=B8=BA?=
 =?UTF-8?q?=E8=B4=9F=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb      |  4 +--
 app/controllers/student_work_controller.rb | 32 +++++++++++-----------
 app/models/member.rb                       |  4 +--
 db/schema.rb                               |  1 -
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index be96124c2..708ac9a14 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -1067,7 +1067,7 @@ class CoursesController < ApplicationController
     sql_select = ""
     if groupid == 0
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
@@ -1079,7 +1079,7 @@ class CoursesController < ApplicationController
         WHERE members.course_id = #{@course.id} ORDER BY score #{score_sort_by}"
     else
       sql_select = "SELECT members.*,(
-          SELECT SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))
+          SELECT SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{@course.id}
diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 0c8bb6c01..1d4611e81 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -93,12 +93,12 @@ class StudentWorkController < ApplicationController
       end
       #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
       if @homework.is_open == 1
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
         if @is_teacher || @homework.homework_detail_manual.nil? ||
             (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
           @show_all = true
         elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
@@ -106,10 +106,10 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -129,15 +129,15 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
             @show_all = true
           end
         else
@@ -148,14 +148,14 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
       if @homework.is_open == 1
-        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
         if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
-          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+          @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
           @show_all = true
         elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
           if @homework.homework_type == 3
@@ -163,10 +163,10 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               @stundet_works = []
             else
-              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            @stundet_works = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
         elsif @homework.homework_detail_manual.comment_status == 2  #学生 && 开启匿评  看到匿评列表
           if @homework.homework_type == 3
@@ -186,15 +186,15 @@ class StudentWorkController < ApplicationController
             if pro.nil?
               my_work = []
             else
-              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:id => pro.student_work_id)
+              my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:id => pro.student_work_id)
             end
           else
-            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where(:user_id => User.current.id)
+            my_work = @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").where(:user_id => User.current.id)
           end
           if my_work.empty?
             @stundet_works = []
           else
-            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+            @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name
             @show_all = true
           end
         else
@@ -205,7 +205,7 @@ class StudentWorkController < ApplicationController
         return
       end
 
-      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name).count
+      @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
     @score = @b_sort == "desc" ? "asc" : "desc"
diff --git a/app/models/member.rb b/app/models/member.rb
index 413fedc07..ee329def8 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -150,7 +150,7 @@ class Member < ActiveRecord::Base
 
   #当前学生在指定作业内的得分
   def homework_common_score homework_common
-    StudentWork.select("IF(final_score is null,null,final_score - absence_penalty - late_penalty) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+    StudentWork.select("IF(final_score is null,null,IF(final_score = 0, 0, final_score - absence_penalty - late_penalty)) as final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
   end
 
   def student_work_score_avg
@@ -158,7 +158,7 @@ class Member < ActiveRecord::Base
   end
 
   def student_work_score_sum
-    sql_select = "SELECT (SUM(IF(student_works.final_score is null,null,student_works.final_score - student_works.absence_penalty - student_works.late_penalty))) as score
+    sql_select = "SELECT (SUM(IF(student_works.final_score IS NULL,NULL,IF(student_works.final_score =0,0,student_works.final_score - student_works.absence_penalty - student_works.late_penalty)))) as score
           FROM student_works,homework_commons
           WHERE student_works.homework_common_id = homework_commons.id
           AND homework_commons.course_id = #{self.course_id}
diff --git a/db/schema.rb b/db/schema.rb
index 5bc8b1ea0..801cee004 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1387,7 +1387,6 @@ ActiveRecord::Schema.define(:version => 20160309024051) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
-    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end

From 61ce439e7408a054320710ae7e229927587cbae7 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 10 Mar 2016 10:02:24 +0800
Subject: [PATCH 20/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E5=AF=B9=E5=AD=A6=E7=94=9F=E7=9A=84=E5=88=86=E7=8F=AD=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_member_list.html.erb | 206 ++++++++++++--------
 public/stylesheets/courses.css              |   3 +
 public/stylesheets/public.css               |   2 +
 3 files changed, 130 insertions(+), 81 deletions(-)

diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index 35d9fe399..eb807bd55 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -1,81 +1,125 @@
-<!-- 加入分班 -->
-<div style="margin-left: 15px">
-  <% if User.current.logged? && User.current.member_of_course?(@course) && @group  %>
-      <%= join_in_course_group(@course.course_groups,@group, User.current) unless @canShowCode %>
-      <span style="font-size: 12px; float: left; margin-right: 5px">
-      <%= l(:label_current_group)%>:&nbsp;
-        <%= @group.name %>
-    </span>
-  <% end %>
-</div>
-<div class="cl"></div>
-
-<% if members.any? %>
-    <% if @result_count %>
-        <p style="font-size: 18px;">
-          <%= l(:label_search_member_count) %>
-          <%= @result_count %>
-          <%= l(:label_member_people) %>
-        </p>
-        <div class="cl"></div>
-    <% end %>
-
-    <div class="st_box">
-      <ul class="st_box_top">
-        <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
-        <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
-        <li class="ml358">
-          <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
-          <% if @score_sort_by == 'desc' %>
-              <a id="pic" href="javascript:" class= "st_down"></a>
-          <% else %>
-              <a id="pic" href="javascript:" class= "st_up"></a>
-          <% end %>
-        </li>
-        <li class="ml50"><a href="javascript:void(0)" >加入时间</a></li>
-      </ul>
-      <div class="cl"></div><!--st_box_top end-->
-
-      <% members.each do |member| %>
-          <div class="st_boxlist">
-            <a href="javascript:" class="st_img">
-              <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
-            </a>
-            <ul>
-              <% if @canShowCode %>
-                  <li>
-                      <% if member.user.show_name == ''%>
-                          <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe,user_path(member.user)) %>
-                      <% else%>
-                          <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
-                      <%end%>
-                  </li>
-              <% else %>
-                  <li><%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe, user_path(member.user)) %></li>
-              <% end %>
-              <br/>
-              <% unless member.user.user_extensions.student_id == ''%>
-                  <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
-              <% end%>
-            </ul>
-            <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
-                     :action => 'show_member_score',
-                     :member_id => member.id,
-                     :remote => true},
-                     :class => 'ml258 c_red' %>
-            <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
-            <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
-          </div>
-          <div class="cl"></div>
-      <% end; reset_cycle %>
-    </div>
-
-    <!--<ul class="wlist">
-      <% #= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
-    </ul>-->
-<% else%>
-    <p class="nodata">
-      <%= l(:label_no_data) %>
-    </p>
-<% end%>
-
+<!-- 加入分班 -->
+<div style="margin-left: 15px">
+  <% if User.current.logged? && User.current.member_of_course?(@course) && @group  %>
+      <%= join_in_course_group(@course.course_groups,@group, User.current) unless @canShowCode %>
+      <span style="font-size: 12px; float: left; margin-right: 5px">
+      <%= l(:label_current_group)%>:&nbsp;
+        <%= @group.name %>
+    </span>
+  <% end %>
+</div>
+<div class="cl"></div>
+
+<% if members.any? %>
+    <% if @result_count %>
+        <p style="font-size: 18px;">
+          <%= l(:label_search_member_count) %>
+          <%= @result_count %>
+          <%= l(:label_member_people) %>
+        </p>
+        <div class="cl"></div>
+    <% end %>
+
+    <div class="st_box">
+      <ul class="st_box_top">
+        <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
+        <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
+        <li style="padding-right: 55px; margin-left: 260px;"><a href="">分班</a></li>
+        <li style="margin-left: 25px;">
+          <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
+          <% if @score_sort_by == 'desc' %>
+              <a id="pic" href="javascript:" class= "st_down"></a>
+          <% else %>
+              <a id="pic" href="javascript:" class= "st_up"></a>
+          <% end %>
+        </li>
+        <li class="ml50"><a href="javascript:void(0)" >加入时间</a></li>
+      </ul>
+      <div class="cl"></div><!--st_box_top end-->
+
+      <% members.each do |member| %>
+          <div class="st_boxlist">
+            <a href="javascript:" class="st_img">
+              <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
+            </a>
+            <ul>
+              <% if @canShowCode %>
+                  <li>
+                      <% if member.user.show_name == ''%>
+                          <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe,user_path(member.user)) %>
+                      <% else%>
+                          <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
+                      <%end%>
+                  </li>
+              <% else %>
+                  <li><%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe, user_path(member.user)) %></li>
+              <% end %>
+              <br/>
+              <% unless member.user.user_extensions.student_id == ''%>
+                  <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
+              <% end%>
+            </ul>
+            <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden">向日葵班</span>
+            <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a></div>
+            <select class="w125 undis class-edit fl" style="margin-left: 105px;">
+              <option value="1" selected="selected">向日葵班</option>
+              <option value="2">学前班</option>
+              <option value="3">幼儿园</option>
+              <option value="4">小学</option>
+              <option value="5">初中</option>
+            </select>
+            <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
+                     :action => 'show_member_score',
+                     :member_id => member.id,
+                     :remote => true},
+                     :class => 'ml25 c_red' %>
+            <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
+            <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
+          </div>
+          <div class="cl"></div>
+      <% end; reset_cycle %>
+    </div>
+
+    <!--<ul class="wlist">
+      <% #= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+    </ul>-->
+<% else%>
+    <p class="nodata">
+      <%= l(:label_no_data) %>
+    </p>
+<% end%>
+
+<script>
+    $(document).ready(function(){
+        /*$(".select-class-option").mouseover(function(){
+            $(this).children(".pic_edit2").css("display","inline-block");
+        });
+        $(".select-class-option").mouseout(function(){
+            $(this).children(".pic_edit2").css("display","none");
+        });*/
+        $(".pic_edit2").click(function(){
+            $(this).parent().hide();
+            $(this).parent().next().show();
+        });
+        $(".class-edit").blur(function(){
+            $(this).hide();
+            $(this).prev().show();
+            var editValue = $(this).children("option:selected").text();
+            $(this).prev().children(":first").text(editValue);
+        });
+        function stopPropagation(e) {
+            if (e.stopPropagation)
+                e.stopPropagation();
+            else
+                e.cancelBubble = true;
+        };
+        $(document).bind('click',function(){
+            $('.class-edit').css('display','none');
+            $('.select-class-option').show();
+        });
+        $('.class-edit,.pic_edit2').bind('click',function(e){
+            stopPropagation(e);
+        });
+    });
+</script>
+
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 1c832b4b3..108f1cd2e 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1289,3 +1289,6 @@ a.contributor_course{float: right; color: #888; font-size: 12px; font-weight: no
 .active-degree-rule{font-size: 12px;color: #888; text-align: center; cursor: pointer;}
 .hero-degree-rule{font-size: 12px;color: #888;text-align: center;}
 .contributor-course-calculate{padding-left: 54px; font-size: 12px;color: #888}
+
+/*20160310分班样式*/
+.select-class-option {width:125px;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 5a9593519..94db0d86a 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -66,6 +66,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml15{ margin-left:15px;}
 .ml16{ margin-left: 16px;}
 .ml20{ margin-left:20px;}
+.ml25 {margin-left:25px;}
 .ml30{margin-left:30px !important;}
 .ml35{margin-left: 35px;}
 .ml40{ margin-left:40px;}
@@ -144,6 +145,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w80{ width:80px;}
 .w90{ width:90px;}
 .w100{width: 100px;}
+.w125{width:125px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
 .w170{width:170px;}

From cc441826ee7b4740970298c92adc52b0d14f1038 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 11:15:37 +0800
Subject: [PATCH 21/32] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=8D=B3=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=BE=97=E5=88=86=E4=B8=BA=E5=BD=93=E6=AC=A1=E7=9A=84?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=BE=97=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb          | 8 ++++++++
 app/views/student_work/_evaluation_un_work.html.erb | 4 ++--
 app/views/student_work/_evaluation_work.html.erb    | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 1d4611e81..e297bc3cd 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -36,6 +36,14 @@ class StudentWorkController < ApplicationController
           unless student_work.save
             resultObj[:status] = 200
           else
+            student_work.name = params[:title]
+            student_work.description = params[:src]
+            if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d")
+              student_work.late_penalty = @homework.late_penalty
+            else
+              student_work.late_penalty = 0
+            end
+            student_work.save
             resultObj[:status] = result["status"].to_i
             resultObj[:time] = student_work_test.created_at.to_s(:db)
             resultObj[:index] = student_work.student_work_tests.count
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index bf022f64c..8ed5f077b 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -15,10 +15,10 @@
         <li>
           <% if @homework.homework_type != 3 %>
               <ul class="mt10 fl">
-                <li class="hworkStName mr10 mt16" title="姓名">
+                <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
                   <%= student_work.user.show_name%>
                 </li>
-                <li class="hworkStID mt16" title="学号">
+                <li class="hworkStID mt16" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>">
                   <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
                 </li>
               </ul>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index cc346361e..f97a8dd2d 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -21,10 +21,10 @@
           <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
             <% if @homework.homework_type != 3 %>
                 <ul class="mt10 fl">
-                  <li class="hworkStName mr10 mt16" title="姓名">
+                  <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
                     <%= student_work.user.show_name%>
                   </li>
-                  <li class="hworkStID mt16" title="学号">
+                  <li class="hworkStID mt16" title="<%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>">
                     <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
                   </li>
                 </ul>

From 8a4175dc02038a9a87ddd52a62f268a154f73c20 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 11:40:56 +0800
Subject: [PATCH 22/32] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E7=A8=8B=E4=BD=9C=E5=93=81=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=9A?=
 =?UTF-8?q?=E8=B7=B3=E5=88=B0=E4=B8=8A=E4=B8=80=E4=B8=AA=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E7=9A=84=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb | 2 +-
 app/views/student_work/_student_work_list.html.erb    | 2 +-
 app/views/student_work/show.js.erb                    | 2 +-
 db/migrate/20160310033019_delete_student_work_data.rb | 8 ++++++++
 db/schema.rb                                          | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/20160310033019_delete_student_work_data.rb

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index d6977325c..8e7c58dc3 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -25,7 +25,7 @@
 
     <li >
       <span class="tit_fb ">编程代码：</span>
-      <div class="showHworkP break_word"><pre id="work-src" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code">
+      <div class="showHworkP break_word"><pre id="work-src" style="display: none;"><%= work.description if work.description%></pre><div class="fontGrey2 font_cus" id="work-code_<%= work.id%>">
         </div>
       </div>
       <div class="cl"></div>
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb
index 1eea8f1c2..53e57fd9c 100644
--- a/app/views/student_work/_student_work_list.html.erb
+++ b/app/views/student_work/_student_work_list.html.erb
@@ -63,7 +63,7 @@
                   } else if(language==4){
                       program_name = 'text/x-java';
                   }
-                  var editor = CodeMirror(document.getElementById("work-code"), {
+                  var editor = CodeMirror(document.getElementById("work-code_<%= work.id%>"), {
                               mode: {name: program_name,
                                   version: 2,
                                   singleLineStringErrors: false},
diff --git a/app/views/student_work/show.js.erb b/app/views/student_work/show.js.erb
index 477f06e0f..afa03bff8 100644
--- a/app/views/student_work/show.js.erb
+++ b/app/views/student_work/show.js.erb
@@ -17,7 +17,7 @@ else{
       program_name = 'text/x-java';
     }
 
-    var editor = CodeMirror(document.getElementById("work-code"), {
+    var editor = CodeMirror(document.getElementById("work-code_<%= @work.id%>"), {
           mode: {name: program_name,
             version: 2,
             singleLineStringErrors: false},
diff --git a/db/migrate/20160310033019_delete_student_work_data.rb b/db/migrate/20160310033019_delete_student_work_data.rb
new file mode 100644
index 000000000..a7ce60953
--- /dev/null
+++ b/db/migrate/20160310033019_delete_student_work_data.rb
@@ -0,0 +1,8 @@
+class DeleteStudentWorkData < ActiveRecord::Migration
+  def up
+    StudentWork.where("homework_common_id = 2604 AND user_id = 10763 AND final_score = 0").destroy_all
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 801cee004..abaafdf80 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160309024051) do
+ActiveRecord::Schema.define(:version => 20160310033019) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From cd1409f950baba8f86c59db2aadca2fbdd1fe61a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 14:51:31 +0800
Subject: [PATCH 23/32] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=88=86=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_member_list.html.erb | 64 ++++-----------------
 1 file changed, 10 insertions(+), 54 deletions(-)

diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index eb807bd55..fd33d5a19 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -24,8 +24,7 @@
       <ul class="st_box_top">
         <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
         <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
-        <li style="padding-right: 55px; margin-left: 260px;"><a href="">分班</a></li>
-        <li style="margin-left: 25px;">
+        <li class="ml358">
           <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
           <% if @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
@@ -45,11 +44,11 @@
             <ul>
               <% if @canShowCode %>
                   <li>
-                      <% if member.user.show_name == ''%>
-                          <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe,user_path(member.user)) %>
-                      <% else%>
-                          <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
-                      <%end%>
+                    <% if member.user.show_name == ''%>
+                        <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe,user_path(member.user)) %>
+                    <% else%>
+                        <%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.show_name}</span>".html_safe,user_path(member.user)) %>
+                    <%end%>
                   </li>
               <% else %>
                   <li><%= link_to("#{l(:label_bidding_user_studentname)}：<span >#{member.user.name}</span>".html_safe, user_path(member.user)) %></li>
@@ -59,20 +58,11 @@
                   <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
               <% end%>
             </ul>
-            <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden">向日葵班</span>
-            <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a></div>
-            <select class="w125 undis class-edit fl" style="margin-left: 105px;">
-              <option value="1" selected="selected">向日葵班</option>
-              <option value="2">学前班</option>
-              <option value="3">幼儿园</option>
-              <option value="4">小学</option>
-              <option value="5">初中</option>
-            </select>
             <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
-                     :action => 'show_member_score',
-                     :member_id => member.id,
-                     :remote => true},
-                     :class => 'ml25 c_red' %>
+                    :action => 'show_member_score',
+                    :member_id => member.id,
+                    :remote => true},
+                        :class => 'ml258 c_red' %>
             <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
             <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
           </div>
@@ -89,37 +79,3 @@
     </p>
 <% end%>
 
-<script>
-    $(document).ready(function(){
-        /*$(".select-class-option").mouseover(function(){
-            $(this).children(".pic_edit2").css("display","inline-block");
-        });
-        $(".select-class-option").mouseout(function(){
-            $(this).children(".pic_edit2").css("display","none");
-        });*/
-        $(".pic_edit2").click(function(){
-            $(this).parent().hide();
-            $(this).parent().next().show();
-        });
-        $(".class-edit").blur(function(){
-            $(this).hide();
-            $(this).prev().show();
-            var editValue = $(this).children("option:selected").text();
-            $(this).prev().children(":first").text(editValue);
-        });
-        function stopPropagation(e) {
-            if (e.stopPropagation)
-                e.stopPropagation();
-            else
-                e.cancelBubble = true;
-        };
-        $(document).bind('click',function(){
-            $('.class-edit').css('display','none');
-            $('.select-class-option').show();
-        });
-        $('.class-edit,.pic_edit2').bind('click',function(e){
-            stopPropagation(e);
-        });
-    });
-</script>
-

From c2553253006460c3533f7e00d3ca80b09df59671 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 15:47:03 +0800
Subject: [PATCH 24/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_new_member_list.html.erb | 54 ++++++++++++++++++++-
 1 file changed, 52 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index fd33d5a19..65429b995 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -24,7 +24,8 @@
       <ul class="st_box_top">
         <li  class="ml50" style="padding-right: 5px;"><a href="">姓名</a></li>
         <li  class="ml10" style="padding-right: 15px;"><a href="">学号</a></li>
-        <li class="ml358">
+        <li style="padding-right: 55px; margin-left: 260px;"><a href="">分班</a></li>
+        <li style="margin-left: 25px;">
           <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%>
           <% if @score_sort_by == 'desc' %>
               <a id="pic" href="javascript:" class= "st_down"></a>
@@ -58,11 +59,26 @@
                   <li><%= link_to("#{l(:label_bidding_user_studentcode)}：<span >#{member.user.user_extensions.student_id}</span>".html_safe,user_path(member.user)) %></li>
               <% end%>
             </ul>
+            <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
+                <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden">向日葵班</span>
+                  <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a></div>
+                <select class="w125 undis class-edit fl" style="margin-left: 105px;">
+                  <option value="1" selected="selected">向日葵班</option>
+                  <option value="2">学前班</option>
+                  <option value="3">幼儿园</option>
+                  <option value="4">小学</option>
+                  <option value="5">初中</option>
+                </select>
+            <% else %>
+                <div class="select-class-option fl" style="margin-left: 105px;">
+                  <span style="width: 100px; text-align: center; float: left;" class="hidden"><%= %></span>
+                </div>
+            <% end %>
             <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
                     :action => 'show_member_score',
                     :member_id => member.id,
                     :remote => true},
-                        :class => 'ml258 c_red' %>
+                        :class => 'ml25 c_red' %>
             <span class="fr mr15 c_grey"><%= format_date(member.created_on)%></span>
             <%= call_hook(:view_projects_settings_members_table_row, { :course => @course, :member => member}) %>
           </div>
@@ -79,3 +95,37 @@
     </p>
 <% end%>
 
+<script>
+    $(document).ready(function(){
+        /*$(".select-class-option").mouseover(function(){
+         $(this).children(".pic_edit2").css("display","inline-block");
+         });
+         $(".select-class-option").mouseout(function(){
+         $(this).children(".pic_edit2").css("display","none");
+         });*/
+        $(".pic_edit2").click(function(){
+            $(this).parent().hide();
+            $(this).parent().next().show();
+        });
+        $(".class-edit").blur(function(){
+            $(this).hide();
+            $(this).prev().show();
+            var editValue = $(this).children("option:selected").text();
+            $(this).prev().children(":first").text(editValue);
+        });
+        function stopPropagation(e) {
+            if (e.stopPropagation)
+                e.stopPropagation();
+            else
+                e.cancelBubble = true;
+        };
+        $(document).bind('click',function(){
+            $('.class-edit').css('display','none');
+            $('.select-class-option').show();
+        });
+        $('.class-edit,.pic_edit2').bind('click',function(e){
+            stopPropagation(e);
+        });
+    });
+</script>
+

From fa3fd56686962c2a317f9f44204844384c2029bf Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 15:48:39 +0800
Subject: [PATCH 25/32] =?UTF-8?q?=E9=A2=98=E5=BA=93=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E5=BC=B9=E6=A1=86=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ea984aa80..96fb8cfce 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -423,7 +423,7 @@ class UsersController < ApplicationController
   end
 
   def choose_user_course
-    homework = HomeworkCommon.find params[:homework].to_i
+    homework = HomeworkCommon.find params[:send_id].to_i
     if !params[:search].nil?
       search = "%#{params[:search].to_s.strip.downcase}%"
       @course = @user.courses.where("is_delete = 0 and #{Course.table_name}.id != #{homework.course_id} and #{Course.table_name}.id = #{params[:search].to_i } or #{Course.table_name}.name like :p",:p=>search).select { |course|  @user.allowed_to?(:as_teacher,course)}

From 08cb7b642c9471640863deeedc75ea7fe48afc0f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 10 Mar 2016 16:43:25 +0800
Subject: [PATCH 26/32] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/files/_upload_course_files.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 133b8b4d6..0a35c783c 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -25,7 +25,7 @@
           <div class="mb5">
             <label class="fl c_dark f14" style="margin-top: 4px;">附件描述：</label>
             <div class="fl">
-              <input  type="text" name="description"  placeholder="文件描述" class="fl W120 ">
+              <input  type="text" name="description"  placeholder="文件描述" class="InputBox fl W160">
             </div>
             <div class="cl"></div>
           </div>

From 0d8052da28e9308c51c32bab42da3186af2643b8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 17:04:26 +0800
Subject: [PATCH 27/32] =?UTF-8?q?=E8=80=81=E5=B8=88=E6=8A=8A=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E5=8A=A0=E5=85=A5=E6=9F=90=E4=B8=80=E4=B8=AA=E5=88=86?=
 =?UTF-8?q?=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         |  7 ++++
 app/helpers/courses_helper.rb                 | 18 ++++++++++
 app/views/courses/_new_member_list.html.erb   | 35 +++++++++++++------
 app/views/courses/teacher_assign_group.js.erb |  0
 config/routes.rb                              |  1 +
 5 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 app/views/courses/teacher_assign_group.js.erb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 708ac9a14..81c21eb3d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -240,6 +240,13 @@ class CoursesController < ApplicationController
     # req[:message] = l(:modal_valid_passing) if req[:message].blank?
     render :json => req
   end
+
+  def teacher_assign_group
+    member = Member.where(:course_id => @course.id, :user_id => User.current.id).first
+    member.course_group_id = params[:course_group_id].to_i
+    member.save
+  end
+
   def join_group
     @subPage_title = l :label_student_list
     group = CourseGroup.find(params[:object_id])
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index cbc514df6..148b20d2e 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -601,6 +601,24 @@ module CoursesHelper
     Course.tagged_with(tag_name).order('updated_at desc')
   end
 
+  #分班下拉框
+  def course_group_option course
+    type = []
+    option1 = []
+    option1 << "暂无"
+    option1 << 0
+    type << option1
+    unless course.course_groups.nil?
+      course.course_groups.each do |cg|
+        option = []
+        option << cg.name
+        option << cg.id
+        type << option
+      end
+    end
+    type
+  end
+
   #课程实践年份下拉框
   def course_time_option year
     type = []
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index 65429b995..12a5d9626 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -60,18 +60,30 @@
               <% end%>
             </ul>
             <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
-                <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden">向日葵班</span>
-                  <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a></div>
-                <select class="w125 undis class-edit fl" style="margin-left: 105px;">
-                  <option value="1" selected="selected">向日葵班</option>
-                  <option value="2">学前班</option>
-                  <option value="3">幼儿园</option>
-                  <option value="4">小学</option>
-                  <option value="5">初中</option>
-                </select>
+                <% if @course.course_groups.nil? %>
+                    <div class="select-class-option fl" style="margin-left: 105px;">
+                      <span style="width: 100px; text-align: center; float: left;" class="hidden">暂无</span>
+                    </div>
+                <% else %>
+                    <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
+                        <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
+                          <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a>
+                        </div>
+                        <%= select( :name,:group_id, course_group_option(@course),
+                                    { :include_blank => false,:selected => member.course_group_id},
+                                    {:onchange=>"join_group_function('#join_group_form_#{member.id}');", :id =>"course_group_id", :name => "course_group_id",:class=>"w125 undis class-edit fl", :style => "margin-left: 105px;"}) %>
+                        <!--<select class="w125 undis class-edit fl" style="margin-left: 105px;">
+                          <option value="1" selected="selected">向日葵班</option>
+                          <option value="2">学前班</option>
+                          <option value="3">幼儿园</option>
+                          <option value="4">小学</option>
+                          <option value="5">初中</option>
+                        </select>-->
+                    <% end %>
+                <% end %>
             <% else %>
                 <div class="select-class-option fl" style="margin-left: 105px;">
-                  <span style="width: 100px; text-align: center; float: left;" class="hidden"><%= %></span>
+                  <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                 </div>
             <% end %>
             <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
@@ -127,5 +139,8 @@
             stopPropagation(e);
         });
     });
+    function join_group_function(id){
+        $(id).submit();
+    }
 </script>
 
diff --git a/app/views/courses/teacher_assign_group.js.erb b/app/views/courses/teacher_assign_group.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index dd02bf4af..2730fac3e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1005,6 +1005,7 @@ RedmineApp::Application.routes.draw do
       get 'course_outline'
       post 'search_course_outline'
       post 'set_course_outline'
+      post 'teacher_assign_group'
       get 'syllabus'
       get 'search_public_orgs_not_in_course'
       get "homework_search"

From a7b9d8424a6440c595cceceb4e5b6d62f6035efe Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Thu, 10 Mar 2016 17:41:53 +0800
Subject: [PATCH 28/32] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=AD=A6=E7=94=9F=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb         | 7 ++++++-
 app/views/courses/_new_member_list.html.erb   | 6 +++---
 app/views/courses/teacher_assign_group.js.erb | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 81c21eb3d..98e195e30 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -242,9 +242,14 @@ class CoursesController < ApplicationController
   end
 
   def teacher_assign_group
-    member = Member.where(:course_id => @course.id, :user_id => User.current.id).first
+    member = Member.where(:course_id => @course.id, :user_id => params[:user_id]).first
     member.course_group_id = params[:course_group_id].to_i
     member.save
+    @course_groups = @course.course_groups
+    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
+    respond_to do |format|
+      format.js
+    end
   end
 
   def join_group
diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb
index 12a5d9626..b399c6035 100644
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@@ -60,12 +60,12 @@
               <% end%>
             </ul>
             <% if User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
-                <% if @course.course_groups.nil? %>
+                <% if @course.course_groups.nil? || @group %>
                     <div class="select-class-option fl" style="margin-left: 105px;">
-                      <span style="width: 100px; text-align: center; float: left;" class="hidden">暂无</span>
+                      <span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                     </div>
                 <% else %>
-                    <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
+                    <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
                         <div class="select-class-option fl" style="margin-left: 105px;"><span style="width: 100px; text-align: center; float: left;" class="hidden"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
                           <a style="display: inline-block;" href="javascript:void(0)" class="pic_edit2 ml5"></a>
                         </div>
diff --git a/app/views/courses/teacher_assign_group.js.erb b/app/views/courses/teacher_assign_group.js.erb
index e69de29bb..1429bb753 100644
--- a/app/views/courses/teacher_assign_group.js.erb
+++ b/app/views/courses/teacher_assign_group.js.erb
@@ -0,0 +1 @@
+$("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>");
\ No newline at end of file

From c18634be8645634fe573c0cfbe0d76c89cbf066a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Mar 2016 15:21:40 +0800
Subject: [PATCH 29/32] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E3=80=82=E6=96=B0=E9=97=BB=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/news_controller.rb | 32 +++++++++---------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 0962deb10..f45e1dbd7 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -107,32 +107,18 @@ class NewsController < ApplicationController
 
   def show
     # 更新news对应的forge_messages的消息viewed字段
+    ids = @news.comments.map { |comment| comment.id }.join(",") unless @news.comments.nil?
     if @project
-      query_message_news = @news.forge_messages
+      # 更新新闻
+      query_message_news = ForgeMessage.where("forge_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      # 更新新闻的时候一并更新回复
+      ForgeMessage.where("forge_message_id in (#{ids}) and forge_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     else
-      query_message_news = @news.course_messages
+      query_message_news = CourseMessage.where("course_message_id =? and user_id =? and viewed =?", @news.id, User.current.id, 0).first
+      CourseMessage.where("course_message_id in (#{ids}) and course_message_type =  'Comment' and user_id = #{User.current.id}").update_all(:viewed => true) unless ids.blank?
     end
-    query_message_news.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-    end
-    # 更新项目新闻的评阅的消息viewed字段
-    current_message_comments = @news.comments
-    current_message_comments.each do |current_message_comment|
-    if @project
-      query_message_comment = current_message_comment.forge_messages
-    else
-      query_message_comment = current_message_comment.course_messages
-    end
-    query_message_comment.each do |query|
-        if User.current.id == query.user_id
-          query.update_attributes(:viewed => true)
-        end
-      end
-    end
-    # end
-
+    query_message_news.update_attribute(:viewed, true) unless query_message_news.nil?
+    # over
     cs = CoursesService.new
     result = cs.show_course_news params,User.current
     @news = result[:news]

From de3a4718ab0c2ddafb96c0b71b850c7c28ce1820 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 11 Mar 2016 15:49:24 +0800
Subject: [PATCH 30/32] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=EF=BC=8C=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E9=A1=B9=E7=9B=AE=EF=BC=8C=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=87=8F=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb  | 1 +
 app/views/layouts/base_org.html.erb      | 1 +
 app/views/layouts/base_projects.html.erb | 3 +++
 app/views/layouts/new_base_user.html.erb | 1 +
 public/stylesheets/new_user.css          | 1 +
 public/stylesheets/public.css            | 1 +
 6 files changed, 8 insertions(+)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 59ed3ad39..5bdc76c34 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -250,6 +250,7 @@
       </div><!--项目标签 end-->
       <!--课程推荐-->
       <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 100</div>
     </div><!--LSide end-->
 
     <div id="RSide" class="fl">
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index f810dd1d6..4166070c4 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -132,6 +132,7 @@
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
       </div>
+      <div class="fontGrey5 mt10 ml20">访问计数 100</div>
     </div>
     <div class="homepageRight" style="margin-top:<%= (params[:show_homepage].nil? && User.current.logged?) ? '10px':'0px' %>;">
       <%= render_flash_messages %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index c30d1b4ed..00525d326 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -158,9 +158,12 @@
         </div>
         <div class="cl"></div>
       </div><!--项目标签 end-->
+
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 100</div>
     </div>
   </div>
 
+
   <div id="RSide" class="fl">
     <%= render_flash_messages %>
     <%= yield %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 731162920..fc42a6ba9 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -226,6 +226,7 @@
           <div class="cl"></div>
         </div>
       </div>
+      <div class="fontGrey5 mt10 ml20">访问计数 100</div>
     </div>
     <div class="homepageRight">
       <%= yield %>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 620feaeac..693e417c1 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -192,6 +192,7 @@ a.c_green{ color:#28be6c;}
 .fontGrey {color:#cecece;}
 .fontGrey2 {color:#888888;}
 .fontGrey3 {color:#484848;}
+.fontGrey5 {color:#a1a1a1;}
 .fontBlue {color:#3498db;}
 a.underline {text-decoration:underline;}
 a.fontBlue {color:#297fb8;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 94db0d86a..b84fb040e 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -230,6 +230,7 @@ a.c_green{ color:#28be6c;}
 .fontGrey2 {color:#888888;}
 .fontGrey3 {color:#484848;}
 .fontGrey4{color:#999999;}
+.fontGrey5 {color:#a1a1a1;}
 .fontBlue {color:#3498db;}
 .fontBlue2 {color:#269ac9 !important;}
 a.underline {text-decoration:underline;}

From 8079254089ed1b402eed840fa69f2a0fffcebabd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Mar 2016 15:51:45 +0800
Subject: [PATCH 31/32] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/courses_controller.rb                   | 2 ++
 app/controllers/organizations_controller.rb             | 2 ++
 app/controllers/projects_controller.rb                  | 2 ++
 app/controllers/users_controller.rb                     | 4 ++++
 db/migrate/20160311072540_add_visits_to_user.rb         | 5 +++++
 db/migrate/20160311072622_add_visits_to_project.rb      | 5 +++++
 db/migrate/20160311072718_add_visits_to_course.rb       | 5 +++++
 db/migrate/20160311072819_add_visits_to_organization.rb | 5 +++++
 db/schema.rb                                            | 6 +++++-
 9 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160311072540_add_visits_to_user.rb
 create mode 100644 db/migrate/20160311072622_add_visits_to_project.rb
 create mode 100644 db/migrate/20160311072718_add_visits_to_course.rb
 create mode 100644 db/migrate/20160311072819_add_visits_to_organization.rb

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 708ac9a14..08559b2ad 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -838,6 +838,8 @@ class CoursesController < ApplicationController
     #   render_403
     #   return
     # end
+    # 统计访问量
+    @course.update_attribute(:visits, @course.visits.to_i + 1)
     #更新创建课程消息状态
     create_course_messages = @course.course_messages.where("user_id =? and course_message_type =? and course_id =? and viewed =?", User.current.id, 'Course', @course.id, 0)
     create_course_messages.update_all(:viewed => true)
diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index f225e7f50..711663c3d 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -69,6 +69,8 @@ class OrganizationsController < ApplicationController
   def show
     if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
       @organization = Organization.find(params[:id])
+      # 统计访问量
+      @organization.update_attribute(:visits, @organization.visits.to_i + 1)
       if params[:org_subfield_id]
         @org_subfield = OrgSubfield.find(params[:org_subfield_id])
         @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3d5030c29..05c80a9fc 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -298,6 +298,8 @@ class ProjectsController < ApplicationController
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end
+    # 统计访问量
+    @project.update_attribute(:visits, @project.visits.to_i + 1)
 =begin
     cond = @project.project_condition(Setting.display_subprojects_issues?)
     has = {
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 96fb8cfce..7fe146926 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1174,6 +1174,10 @@ class UsersController < ApplicationController
   end
 
   def show
+    # 统计访问量
+    unless User.current == @user
+      @user.update_attribute(:visits, @user.visits.to_i + 1)
+    end
     #更新用户申请成为课程老师或教辅消息的状态
     if params[:course_id] != nil
       join_course_messages = CourseMessage.where("course_id =? and course_message_type =? and user_id =? and course_message_id =? and viewed =?",
diff --git a/db/migrate/20160311072540_add_visits_to_user.rb b/db/migrate/20160311072540_add_visits_to_user.rb
new file mode 100644
index 000000000..2169a4b0b
--- /dev/null
+++ b/db/migrate/20160311072540_add_visits_to_user.rb
@@ -0,0 +1,5 @@
+class AddVisitsToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :visits, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20160311072622_add_visits_to_project.rb b/db/migrate/20160311072622_add_visits_to_project.rb
new file mode 100644
index 000000000..1e67d9409
--- /dev/null
+++ b/db/migrate/20160311072622_add_visits_to_project.rb
@@ -0,0 +1,5 @@
+class AddVisitsToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :visits, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20160311072718_add_visits_to_course.rb b/db/migrate/20160311072718_add_visits_to_course.rb
new file mode 100644
index 000000000..4d4b682cf
--- /dev/null
+++ b/db/migrate/20160311072718_add_visits_to_course.rb
@@ -0,0 +1,5 @@
+class AddVisitsToCourse < ActiveRecord::Migration
+  def change
+    add_column :courses, :visits, :integer, :default => 0
+  end
+end
diff --git a/db/migrate/20160311072819_add_visits_to_organization.rb b/db/migrate/20160311072819_add_visits_to_organization.rb
new file mode 100644
index 000000000..74bbcb5c9
--- /dev/null
+++ b/db/migrate/20160311072819_add_visits_to_organization.rb
@@ -0,0 +1,5 @@
+class AddVisitsToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :visits, :integer, :default => 0
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index abaafdf80..d738b90c4 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160310033019) do
+ActiveRecord::Schema.define(:version => 20160311072819) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -508,6 +508,7 @@ ActiveRecord::Schema.define(:version => 20160310033019) do
     t.integer  "is_excellent",                  :default => 0
     t.integer  "excellent_option",              :default => 0
     t.integer  "is_copy",                       :default => 0
+    t.integer  "visits",                        :default => 0
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -1284,6 +1285,7 @@ ActiveRecord::Schema.define(:version => 20160310033019) do
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
     t.boolean  "allow_guest_download", :default => true
+    t.integer  "visits",               :default => 0
   end
 
   create_table "phone_app_versions", :force => true do |t|
@@ -1443,6 +1445,7 @@ ActiveRecord::Schema.define(:version => 20160310033019) do
     t.integer  "acts_count",             :default => 0
     t.integer  "journals_count",         :default => 0
     t.integer  "boards_reply_count",     :default => 0
+    t.integer  "visits",                 :default => 0
   end
 
   add_index "projects", ["lft"], :name => "index_projects_on_lft"
@@ -1902,6 +1905,7 @@ ActiveRecord::Schema.define(:version => 20160310033019) do
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
     t.integer  "gid"
+    t.integer  "visits",                          :default => 0
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"

From 97a7694778259d0686161fcd381087e34f3ce732 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 11 Mar 2016 15:58:16 +0800
Subject: [PATCH 32/32] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=95=B0--views?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb  | 2 +-
 app/views/layouts/base_org.html.erb      | 2 +-
 app/views/layouts/base_projects.html.erb | 2 +-
 app/views/layouts/new_base_user.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index d46ddbf06..f382a433c 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -250,7 +250,7 @@
       </div><!--项目标签 end-->
       <!--课程推荐-->
       <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 100</div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @course.visits.to_i %></div>
     </div><!--LSide end-->
 
     <div id="RSide" class="fl">
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index 4166070c4..201e63a5d 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -132,7 +132,7 @@
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 100</div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @organization.visits.to_i %></div>
     </div>
     <div class="homepageRight" style="margin-top:<%= (params[:show_homepage].nil? && User.current.logged?) ? '10px':'0px' %>;">
       <%= render_flash_messages %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 00525d326..5ad25d5bd 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -159,7 +159,7 @@
         <div class="cl"></div>
       </div><!--项目标签 end-->
 
-      <div class="fontGrey5 mt10 ml10 mb10">访问计数 100</div>
+      <div class="fontGrey5 mt10 ml10 mb10">访问计数 <%= @project.visits.to_i %></div>
     </div>
   </div>
 
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index fc42a6ba9..eaf58ed7e 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -226,7 +226,7 @@
           <div class="cl"></div>
         </div>
       </div>
-      <div class="fontGrey5 mt10 ml20">访问计数 100</div>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %></div>
     </div>
     <div class="homepageRight">
       <%= yield %>