From baf7e1dbc011382116a0ab52a7e89e1d7f094bac Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 19:52:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=9E=E6=8E=A5=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8D=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb       |  2 +-
 .../users/_user_import_resource_list.html.erb  | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 5dd2495c9..caab1a49b 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -15,7 +15,7 @@
           </li>
           <li class="resource-list-name fl">
             <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
-                <a href="" style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
+                <a style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
             <% else %>
                 <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
             <% end %>
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 38770421d..2052f8219 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,8 +6,22 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
-              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+              <% if attach.is_public == 0 && (@type == "6" || @type == "2") && attach.author != User.current && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                  <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
+              <% else %>
+                  <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <% end %>
+
+              <span>
+                <% if attach.is_public == 0 && attach.get_apply_resource_status(attach.id, attach.author_id) != 2 %>
+                    <a href="" style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
+                <% else %>
+                    <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
+                <% end %>
+              </span>
+              <% if attach.is_public == 0  && (@type == "6" || @type == "2") && attach.author != User.current %>
+                  <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
+              <% end %>
             </label>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>