From 28a6e09edd74eae70323792cf0f4faba56c67d25 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 13 Nov 2015 14:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=89=B9=E9=87=8F=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb | 2 +-
 app/views/users/user_resource.html.erb   | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 6f47e3535..156da0f07 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -7,7 +7,7 @@
     <% attachments.each do |attach| %>
         <ul class="resourcesList" onmouseover="$(this).children().css('background-color', '#e1e1e1')" onmouseout="$(this).children().css('background-color', 'white')">
           <li class="resourcesListCheckbox fl">
-            <input name="checkbox1[]" type="checkbox" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
+            <input name="checkbox1[]" type="checkbox" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
           </li>
           <li class="resourcesListName fl">
             <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index f6bb3c8cb..3bd114e7c 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -287,7 +287,11 @@
     //批量删除
     function batch_delete(){
         var data = $("#resources_list_form").serialize();
-        if(data != "" && confirm('您删不掉这其中上传者不是您的资源，确认要删除这些资源吗？')) {
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("含有上传者不是您的资源");
+            return;
+        }
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
             $.post(
                     '<%= user_resource_delete_user_path(@user)%>',
                     $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交