From caec5e54901935f129ea1c65b7f2f8e3ed1f0722 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 26 Aug 2015 17:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb      | 4 +++-
 app/views/users/_course_message.html.erb | 8 +++++++-
 app/views/users/_course_poll.html.erb    | 9 ++++++++-
 db/schema.rb                             | 2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e8d512a2e..6b7545fe8 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -74,6 +74,8 @@ class UsersController < ApplicationController
   include WordsHelper
   include GitlabHelper
   include UserScoreHelper
+
+  include PollHelper
   helper :user_score
   helper :journals
 
@@ -575,7 +577,7 @@ class UsersController < ApplicationController
     @type = params[:type]
     user_project_ids = @user.projects.visible.empty? ? "(-1)" : "(" + @user.projects.visible.map{|project| project.id}.join(",") + ")"
     user_course_ids = @user.courses.visible.empty? ? "(-1)" : "(" + @user.courses.visible.map{|course| course.id}.join(",") + ")"
-    course_types = "('Message','News','HomeworkCommon')"
+    course_types = "('Message','News','HomeworkCommon','poll')"
     project_types = "('Message','Issue')"
     if @type
       case @type
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 48f2636c4..2d5e372ea 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -23,7 +23,13 @@
           <div class="homepagePostSubmitContainer">
             <div class="homepagePostDeadline">时间：<%= format_date(activity.created_on) %></div>
           </div>
-          <div class="homepagePostIntro" style="word-break:break-all">（描述）<%= activity.content.html_safe %></div>
+          <div class="homepagePostIntro" style="word-break:break-all">（描述）
+          <% if activity.parent_id.nil? %>
+              <%= activity.content.to_s.html_safe%>
+          <% else %>
+              <%= activity.parent.content.to_s.html_safe%>
+          <% end %>
+          </div>
           <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
             <ul>
               <li class="homepagePostSettingIcon">
diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index 26e928dbf..b55280262 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -1,3 +1,5 @@
+<%# has_commit = has_commit_poll?(activity.id ,User.current)%>
+<% poll_name = activity.polls_name.empty? ? l(:label_poll_new) : activity.polls_name%>
 <div class="resources mt15">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
@@ -16,7 +18,12 @@
         <!--<a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a>-->
       </div>
       <div class="homepagePostTitle" style="word-break:break-all;">
-        <a href="javascript:void(0);" class="postGrey"><%=activity.polls_name.to_s%>(问卷名称)</a>
+        <%#= link_to activity.polls_name.to_s+"(问卷名称)", %>
+        <%# if has_commit %>
+            <%#= link_to poll_name, poll_result_poll_path(activity.id), :class => "polls_title polls_title_w fl c_dblue"%>
+        <%# else %>
+            <%= link_to poll_name+"(问卷名称)", poll_path(activity.id), :class => "postGrey"%>
+        <%# end %>
       </div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">时间：<%= format_date(activity.created_at) %></div>
diff --git a/db/schema.rb b/db/schema.rb
index a77eceb9a..c905966ac 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1311,6 +1311,7 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
     t.datetime "updated_at",                                                   :null => false
     t.integer  "late_penalty",                                  :default => 0
     t.integer  "absence_penalty",                               :default => 0
+    t.integer  "system_score"
   end
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
@@ -1528,7 +1529,6 @@ ActiveRecord::Schema.define(:version => 20150826061843) do
     t.string   "identity_url"
     t.string   "mail_notification",               :default => "",    :null => false
     t.string   "salt",              :limit => 64
-    t.integer  "gid"
   end
 
   add_index "users", ["auth_source_id"], :name => "index_users_on_auth_source_id"