From 36456f8b2dbd612a23419709e03967976916add8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 1 Aug 2015 17:38:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE/?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=9A=84=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=B6=85=E9=93=BE=E6=8E=A5=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E5=B9=B6=E7=BB=99?=
 =?UTF-8?q?=E5=87=BA=E7=9B=B8=E5=BA=94=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_course_activities.html.erb | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/views/users/user_course_activities.html.erb b/app/views/users/user_course_activities.html.erb
index bdebee6a5..eacb620f2 100644
--- a/app/views/users/user_course_activities.html.erb
+++ b/app/views/users/user_course_activities.html.erb
@@ -10,10 +10,19 @@
   </span>
   <a href="<%= user_path(rec[:item].user.id) %>" class="c_orange course_name fl mr5" title="<%= rec[:item].user.show_name %>"><%= rec[:item].user.show_name %></a>
     <span class="fl mr5 c_grey"><%= get_activity_opt(rec[:item],rec[:e]) %></span>
-    <a href="<%= get_activity_url(rec[:item],rec[:e]) %>"
-       class="c_blue02 fl users_courses_txt hidepic" title="<%= get_activity_act_showname(rec[:item]) %>">
-      <%= get_activity_act_showname_htmlclear(rec[:item]) %>
-    </a>
+    <% if( rec[:e].is_public == false || rec[:e].is_public == 0 ) %>
+        <a href="<%= get_activity_url(rec[:item],rec[:e]) %>"
+           class="c_grey fl users_courses_txt hidepic"
+           title="<% if(rec[:item].activity_container_type=='Project')%><%='该项目是私有的，您无权查看。'%><% else %><%='该课程是私有的，您无权查看。' %><% end %>">
+          <%= get_activity_act_showname_htmlclear(rec[:item]) %>
+        </a>
+    <% else %>
+        <a href="<%= get_activity_url(rec[:item],rec[:e]) %>"
+           class="c_blue02 fl users_courses_txt hidepic" title="<%= get_activity_act_showname(rec[:item]) %>">
+          <%= get_activity_act_showname_htmlclear(rec[:item]) %>
+        </a>
+    <% end %>
+
     <span class="fr c_grey mr10"><%= time_tag(get_activity_act_createtime(rec[:item])).html_safe %></span>
   </div>
 <% end %>
\ No newline at end of file

From 188c056e95f18d85e7103d521665d599603dd6a2 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 1 Aug 2015 17:42:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 8c12d62e0..713fc84d2 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -6,7 +6,7 @@
 <div class="pro_page_box">
   <div class="pro_page_top break_word">
     <%= link_to "#{@issue.project.name}"+">", project_issues_path(@issue.project) %>
-    <a href="javascript:void(0)"><%= "#" + @issue.project_index %></a>
+    <a href="javascript:void(0)"><%= "#" + @issue.id.to_s %></a>
   </div>
   <div class="problem_main">
     <div class="ping_dispic">
@@ -15,7 +15,7 @@
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
         <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
-        <span style="padding-left: 5px;"><%= @issue.subject %></span>
+        <span style="padding-left: 5px;"><%= @issue.id %></span>
         <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span>
       </p><br/>
 

From d1418f1bbe96f9adeef47ed13af8308f94c7ac10 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 1 Aug 2015 17:45:40 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=BB=E9=A2=98--id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 713fc84d2..01cbea1c1 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -15,7 +15,7 @@
     <div class="talk_txt fl">
       <p class="pro_page_tit" style="word-break:break-all;">
         <span class='<%= "#{get_issue_type(@issue.tracker_id)[0]} fl" %>' title="<%= get_issue_type(@issue.tracker_id)[1] %>"></span>
-        <span style="padding-left: 5px;"><%= @issue.id %></span>
+        <span style="padding-left: 5px;"><%= @issue.subject %></span>
         <span class='<%= "#{get_issue_priority(@issue.priority_id)[0]} " %>'><%= get_issue_priority(@issue.priority_id)[1] %></span>
       </p><br/>