From 7fcd229f854070faacc51d9f6bd93c3d4327e87f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 13 Apr 2016 10:09:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A--=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD=EF=BC=9A=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=87=B3=E8=AF=A5=E9=A1=B9=E7=9B=AE=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../student_work/_evaluation_un_work.html.erb  | 18 ++++++++++++------
 .../student_work/_evaluation_work.html.erb     | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 884bb8eb1..57dd786eb 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -5,8 +5,8 @@
       <li class="hworkPortrait mt15 mr10">
         <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %>
       </li>
-      <div onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
-        <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>">
+      <div class="student_work_<%= student_work.id%>">
+        <li class="hworkName mt15 mr15 <%= @homework.homework_type == 2 ? '' : 'width165'%>" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
           <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%>
           <div>
             <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
@@ -14,7 +14,7 @@
         </li>
         <li>
           <% if @homework.homework_type != 3 %>
-              <ul class="mt10 fl">
+              <ul class="mt10 fl" style="cursor: pointer;" onclick="show_student_work('<%= student_work_path(student_work)%>');">
                 <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
                   <%= student_work.user.show_name%>
                 </li>
@@ -24,9 +24,15 @@
               </ul>
           <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
               <ul class="mt10 fl">
-                <li class="hworkPrName mr10 mt12" title="项目名称">
-                  <%= student_work.project.name %>
-                </li>
+                <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+                    <li  class="hworkPrName mr10 mt12" title="项目名称">
+                      <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+                    </li>
+                <% else %>
+                    <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+                      <%= student_work.project.name %>
+                    </li>
+                <% end %>
               </ul>
           <% end %>
         </li>
diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb
index f97a8dd2d..ad2ee56c3 100644
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@@ -18,9 +18,9 @@
               <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%>
             </div>
           </li>
-          <li onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;" class="student_work_<%= student_work.id%>">
+          <li class="student_work_<%= student_work.id%>">
             <% if @homework.homework_type != 3 %>
-                <ul class="mt10 fl">
+                <ul class="mt10 fl" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
                   <li class="hworkStName mr10 mt16" title="<%= student_work.user.show_name%>">
                     <%= student_work.user.show_name%>
                   </li>
@@ -30,9 +30,15 @@
                 </ul>
             <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
                 <ul class="mt10 fl">
-                  <li class="hworkPrName mr10 mt12" title="项目名称">
-                    <%= student_work.project.name %>
-                  </li>
+                  <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %>
+                      <li  class="hworkPrName mr10 mt12" title="项目名称">
+                        <%= link_to( student_work.project.name, project_path(student_work.project.id))%>
+                      </li>
+                  <% else %>
+                      <li class="hworkPrName mr10 mt12" title="该项目是私有的">
+                        <%= student_work.project.name %>
+                      </li>
+                  <% end %>
                 </ul>
             <% end %>
           </li>