From b8d04c13526a2d0a0738caf02d14ee0b319c22a4 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 2 Sep 2016 16:40:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E4=B8=BB=E8=AE=B2=E8=80=81=E5=B8=88=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=80=81=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_courses_list.html.erb     | 2 +-
 app/views/users/_user_course_list.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_courses_list.html.erb b/app/views/users/_courses_list.html.erb
index ab6c8ff81..d79215f9a 100644
--- a/app/views/users/_courses_list.html.erb
+++ b/app/views/users/_courses_list.html.erb
@@ -10,7 +10,7 @@
             <div class="syllabus_class_w ">
               <a href="<%= allow_visit ? course_path(course.id) : "javascript:void(0)" %>" class="syllabus_class_title fl" target="_blank" title="<%= allow_visit ? "" : "私有班级不可访问" %>"><%= course.name %></a>
               <span class="<%= course.is_public == 0 ? 'syllabus_class_private' : 'syllabus_class_open' %> fl ml10 mt3 syllabus_class_property"><%= course.is_public == 0 ? '私有' : '公开' %></span>
-              <span class="fr sy_p_grey hidden" style="max-width: 120px;">主讲老师：<%= link_to course.teacher.show_name, user_path(course.teacher) %></span>
+              <span class="fr sy_p_grey hidden" style="max-width: 120px;">创建老师：<%= link_to course.teacher.show_name, user_path(course.teacher) %></span>
 
               <div class="cl"></div>
             </div>
diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb
index 9013c41f4..f757b170b 100644
--- a/app/views/users/_user_course_list.html.erb
+++ b/app/views/users/_user_course_list.html.erb
@@ -23,7 +23,7 @@
                             :style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
                 <% teacher = User.where("id=?",course.tea_id).first%>
                 <span class="fr grayTxt">
-                    <%='主讲老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
+                    <%='创建老师：'+(teacher.try(:realname) != " " ? teacher.lastname + teacher.firstname : teacher.try(:login)) %>
                   </span>
               </li>
               <div class="cl"></div>

From 22e914eec225a38e4ef81c862975c8520a5a55b9 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 2 Sep 2016 16:42:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BB=96=E4=BA=BA?=
 =?UTF-8?q?=E7=9A=84=E7=95=99=E8=A8=80=E5=8A=A8=E6=80=81=E6=8A=A5500?=
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 8e729b083..5aab1df49 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1704,7 +1704,7 @@ class UsersController < ApplicationController
         sql = "user_id = #{@user.id} and ((container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids} and act_type in #{course_types}))"
       end
       if User.current != @user
-        sql += "and user_id = #{@user.id}"
+        sql += " and user_id = #{@user.id}"
       end
     else
       if User.current != @user

From 2cd41cde7f61a71765e65535a3ce9251466e69a5 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 2 Sep 2016 19:05:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?1706=E9=A1=B9=E7=9B=AE500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_project_issue.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 7b3509f2c..131354df0 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -80,7 +80,7 @@
       <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
       <div class="cl"></div>
       <%# 局部刷新：修改xissue属性 %>
-      <% if User.current.member_of?(activity.project) %>
+      <% if User.current.member_of?(activity.project) && !activity.nil? && !activity.status.nil? %>
           <% unless params[:action] == "index" %>
               <div id="div_user_issue_detail_<%=activity.id %>">
                 <%= render :partial => 'users/project_issue_detail', :locals => {:activity => activity} %>