From 395fb8fae6227ad12f50c15bf994a35a1e427c67 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 28 Mar 2016 22:37:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9pagination,=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=8C=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb          |   2 +
 app/views/users/_resources_list.html.erb     | 343 ------------------
 app/views/users/_user_resource_info.html.erb | 350 ++++++++++++++++++-
 app/views/users/user_resource_create.js.erb  |  29 +-
 lib/redmine/pagination.rb                    |   8 +-
 5 files changed, 372 insertions(+), 360 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f885c5c1c..1cf4534bb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1618,8 +1618,10 @@ class UsersController < ApplicationController
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
+
     @status = params[:status]
     @type = params[:type]
+    @path = user_resource_user_path(User.current, :type => @type)
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index a545038f1..69b512653 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -27,348 +27,5 @@
 <% end %>
 
 <script>
-    var pageX = 0;
-    var pageY = 0;
-    //当前选中的行
-    var line;
-    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
-    var last_line;
-    //资源名称
-    var res_name;
-    //资源名称的链接
-    var res_link;
-    var id; //资源id
-    var sendType = '1';  //发送到课程 1  发送到项目 2
-    var lastSendType;  //保存上次发送的发送类型
-    $("#resources_list").mousedown(function(e) {
-        //如果是右键的话
-        if (3 == e.which) {
-            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
-                e.preventDefault();
-                return ;
-            }
-            document.oncontextmenu = function() {return false;}
-            pageX = e.clientX;
-            pageY = e.clientY;
-            $("#contextMenu").hide();
-            $("#contextMenu").attr("style","display: block; position: fixed; top:"
-                    + pageY
-                    + "px; left:"
-                    + pageX
-                    + "px; width: 80px;");
-            $("#contextMenu").show();
-            //当前光标所在的对象
-
-            var ele = document.elementFromPoint(pageX,pageY);
-            //转换为jquery对象
-            line = $(ele).parent();
-            //如果上一条存在被选中，那么将上一条的背景色改为白色
-            if(last_line != null){
-                last_line.children().css("background-color", 'white');
-                restore();
-                last_line == null;
-            }
-            //如果当前的tag是li，那么还要li的父级元素
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-            //将当前的元素的所有子元素的背景色改为蓝色
-            line.children().css("background-color", '#e1e1e1');
-            //将当前元素赋给 上一个对象 保存起来。
-            last_line = line;
-        }
-    });
-    //元素包含关系计算
-    var contains  = function(root, el) {
-        if (root.compareDocumentPosition)
-            return root === el || !!(root.compareDocumentPosition(el) & 16);
-        if (root.contains && el.nodeType === 1){
-            return root.contains(el) && root !== el;
-        }
-        while ((el = el.parentNode))
-            if (el === root) return true;
-        return false;
-    }
-    $(document.body).click(function(e) {
-        //在列表上的任何单击事件都要恢复原来的样子
-        //隐藏右键菜单
-        //e.preventDefault();
-        $("#contextMenu").hide();
-        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
-            return ;
-        }
-        document.oncontextmenu = function() {return true;}
-        //如果当前行为空，那么要将当前行的拿到
-        var ele;
-        if(line == null){
-            ele = document.elementFromPoint(e.clientX, e.clientY);
-            line = $(ele).parent();
-            //如果是在li上点击事件，那么要获得父组件
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-
-        }
-        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
-        if( contains($("#resources_list").get(0),line.get(0))){
-            line.children().css("background-color", 'white');
-        }
-
-        //当前行恢复编辑状态到链接状态
-        if(ele && ele.nodeName != 'INPUT') {
-            restore();
-        }
-        line = null;
-    });
-    //只要有一个选中了就是true
-    function checkboxSelected(){
-        selected = false;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == true){
-                selected = true;
-            }
-        });
-        return selected;
-    }
-    //只有全选才是true
-    function checkboxAllSelected(){
-        allSelected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == undefined){
-                allSelected = false;
-            }
-        });
-        return allSelected;
-    }
-    //只有全部不选才是true
-    function checkboxAllDeselected(){
-        allDeselected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                allDeselected = false;
-            }
-        });
-        return allDeselected;
-    }
-    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
-    function checkAllBox(checkbox){
-        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
-        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
-            $("#checkboxAll").attr('checked',true);
-        }else{
-            $("#checkboxAll").attr('checked',false);
-        }
-        $("#res_count").html(getCheckBoxSeletedCount());
-
-    }
-    //获取当前checkbox选中的数目
-    function getCheckBoxSeletedCount(){
-        var i = 0;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                i ++;
-            }
-        });
-        return i;
-    }
-    //全选反选
-    function all_select(){
-
-        if($("#checkboxAll").attr('checked')){
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',true);
-            });
-            $("#res_count").html(getCheckBoxSeletedCount());
-        }else{
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',false);
-            });
-            $("#res_count").html(0);
-        }
-    }
-
-    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-    }
-    //批量删除
-    function batch_delete(){
-        var data = $("#resources_list_form").serialize();
-        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
-            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
-            return;
-        }
-        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
-            alert("您只能删除自己上传的资源，请重新选择后再删除。");
-            return;
-        }
-
-        if(data != "" && confirm('确认要删除这些资源吗？')) {
-            $.post(
-                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
-                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
-                    function (data) {
-
-                    }
-            );
-        }
-    }
-
-
-
-    function show_send_(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }
-    }
-
-    function batch_send(){
-        if($("#resources_list_form").serialize() == ""){
-            alert('暂时不支持多页选择，您当前页没有选择任何资源');
-            return ;
-        }
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-
-        }
-    }
-
-    function preview(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        $.ajax({
-            type:'get',
-            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
-        });
-    }
-
-    function rename(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(user_id === '<%= User.current.id %>') {
-            res_name = line.children().eq(1).children().attr('title');
-            res_link = line.children().eq(1).html();
-            line.children().eq(1).html(
-                            '<input name="res_name" id="res_name" ' +
-                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
-                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
-                            'value="'+res_name+
-                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
-            $("#res_name").focus();
-            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
-        }else{
-            alert('您无法修改此资源！')
-        }
-    }
-    String.prototype.trim = function() {
-        var str = this,
-                str = str.replace(/^\s\s*/, ''),
-                ws = /\s/,
-                i = str.length;
-        while (ws.test(str.charAt(--i)));
-        return str.slice(0, i + 1);
-    }
-
-
-
-    //恢复编辑状态到链接状态
-    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
-    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
-    function restore(){
-        //上一行不为空 且链接不为空
-        if( last_line != null && res_link != null && res_link != '') {
-            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
-            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
-                return;
-            }
-            if( name && name != res_name.trim()){
-
-                if(confirm('确定修改为 '+name)){
-                    $.ajax({
-                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
-                        type:'get',
-                        success:function (data)
-                        {
-                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                last_line.children().eq(1).html(res_link);
-                                last_line.children().eq(1).children().attr('title', name);
-                                last_line.children().eq(1).children().attr('href', data);
-                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
-                            } else {
-                                last_line.children().eq(1).html(res_link);
-                                res_link = null; //如果修改失败，恢复之后将res_link置空
-                            }
-                        }
-                    } );
-                }else{
-                    last_line.children().eq(1).html(res_link);
-                    res_link = null; //如果没有做修改，恢复之后将res_link置空
-                }
-            }else {
-                last_line.children().eq(1).html(res_link);
-                res_link = null;//如果没有做修改，恢复之后将res_link置空
-            }
-
-
-        }
-    }
-
-    function delete_file() {
-        $("#contextMenu").hide();
-        document.oncontextmenu = function () {
-            return true;
-        }
-        line.children().css("background-color", 'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(line.children().first().children().data('hasHistory') == 'Y'){
-            alert('该资源存在历史版本，不能删除');
-            return;
-        }
-        if(user_id === '<%= User.current.id%>') {
-            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
-                $.ajax({
-                    type: 'post',
-                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
 
 </script>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index bea78130a..0a3f94bb3 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -42,7 +42,353 @@
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
     <!--  data-remote="true" 这个属性会让ajax请求状态标志就在当前按钮的上方显示，就不会滚动浏览器，因而弹出框也会在当前窗口中央展示-->
-    <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send_();" data-remote="true" onfocus="this.blur()" >发送</a></li>
+    <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send();" onfocus="this.blur()" >发送</a></li>
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
   </ul>
-</ul>
\ No newline at end of file
+</ul>
+
+<script>
+    var pageX = 0;
+    var pageY = 0;
+    //当前选中的行
+    var line;
+    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
+    var last_line;
+    //资源名称
+    var res_name;
+    //资源名称的链接
+    var res_link;
+    var id; //资源id
+    var sendType = '1';  //发送到课程 1  发送到项目 2
+    var lastSendType;  //保存上次发送的发送类型
+    $("#resources_list").mousedown(function(e) {
+        //如果是右键的话
+        if (3 == e.which) {
+            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
+                e.preventDefault();
+                return ;
+            }
+            document.oncontextmenu = function() {return false;}
+            pageX = e.clientX;
+            pageY = e.clientY;
+            $("#contextMenu").hide();
+            $("#contextMenu").attr("style","display: block; position: fixed; top:"
+                    + pageY
+                    + "px; left:"
+                    + pageX
+                    + "px; width: 80px;");
+            $("#contextMenu").show();
+            //当前光标所在的对象
+
+            var ele = document.elementFromPoint(pageX,pageY);
+            //转换为jquery对象
+            line = $(ele).parent();
+            //如果上一条存在被选中，那么将上一条的背景色改为白色
+            if(last_line != null){
+                last_line.children().css("background-color", 'white');
+                restore();
+                last_line == null;
+            }
+            //如果当前的tag是li，那么还要li的父级元素
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+            //将当前的元素的所有子元素的背景色改为蓝色
+            line.children().css("background-color", '#e1e1e1');
+            //将当前元素赋给 上一个对象 保存起来。
+            last_line = line;
+        }
+    });
+    //元素包含关系计算
+    var contains  = function(root, el) {
+        if (root.compareDocumentPosition)
+            return root === el || !!(root.compareDocumentPosition(el) & 16);
+        if (root.contains && el.nodeType === 1){
+            return root.contains(el) && root !== el;
+        }
+        while ((el = el.parentNode))
+            if (el === root) return true;
+        return false;
+    }
+    $(document.body).click(function(e) {
+        //在列表上的任何单击事件都要恢复原来的样子
+        //隐藏右键菜单
+        //e.preventDefault();
+        $("#contextMenu").hide();
+        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
+            return ;
+        }
+        document.oncontextmenu = function() {return true;}
+        //如果当前行为空，那么要将当前行的拿到
+        var ele;
+        if(line == null){
+            ele = document.elementFromPoint(e.clientX, e.clientY);
+            line = $(ele).parent();
+            //如果是在li上点击事件，那么要获得父组件
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+
+        }
+        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
+        if( contains($("#resources_list").get(0),line.get(0))){
+            line.children().css("background-color", 'white');
+        }
+
+        //当前行恢复编辑状态到链接状态
+        if(ele && ele.nodeName != 'INPUT') {
+            restore();
+        }
+        line = null;
+    });
+    //只要有一个选中了就是true
+    function checkboxSelected(){
+        selected = false;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == true){
+                selected = true;
+            }
+        });
+        return selected;
+    }
+    //只有全选才是true
+    function checkboxAllSelected(){
+        allSelected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == undefined){
+                allSelected = false;
+            }
+        });
+        return allSelected;
+    }
+    //只有全部不选才是true
+    function checkboxAllDeselected(){
+        allDeselected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                allDeselected = false;
+            }
+        });
+        return allDeselected;
+    }
+    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
+    function checkAllBox(checkbox){
+        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
+        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
+            $("#checkboxAll").attr('checked',true);
+        }else{
+            $("#checkboxAll").attr('checked',false);
+        }
+        $("#res_count").html(getCheckBoxSeletedCount());
+
+    }
+    //获取当前checkbox选中的数目
+    function getCheckBoxSeletedCount(){
+        var i = 0;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                i ++;
+            }
+        });
+        return i;
+    }
+    //全选反选
+    function all_select(){
+
+        if($("#checkboxAll").attr('checked')){
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',true);
+            });
+            $("#res_count").html(getCheckBoxSeletedCount());
+        }else{
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',false);
+            });
+            $("#res_count").html(0);
+        }
+    }
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            return;
+        }
+
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
+        });
+    }
+
+    function rename(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(user_id === '<%= User.current.id %>') {
+            res_name = line.children().eq(1).children().attr('title');
+            res_link = line.children().eq(1).html();
+            line.children().eq(1).html(
+                            '<input name="res_name" id="res_name" ' +
+                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
+                            'value="'+res_name+
+                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
+            $("#res_name").focus();
+            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
+        }else{
+            alert('您无法修改此资源！')
+        }
+    }
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.ajax({
+                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                        {
+                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                last_line.children().eq(1).html(res_link);
+                                last_line.children().eq(1).children().attr('title', name);
+                                last_line.children().eq(1).children().attr('href', data);
+                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                            } else {
+                                last_line.children().eq(1).html(res_link);
+                                res_link = null; //如果修改失败，恢复之后将res_link置空
+                            }
+                        }
+                    } );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(line.children().first().children().data('hasHistory') == 'Y'){
+            alert('该资源存在历史版本，不能删除');
+            return;
+        }
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index e818f2870..cc7e543c8 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,15 +1,16 @@
-closeModal();
-$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html(<%= @atta_count%>);
-$("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
-//更新状态
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
-$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
-$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
-$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
-$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+closeModal();
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
+debugger
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#res_all_count").html(<%= @atta_count%>);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
 $("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index 41702e2ce..4f1e8ac46 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -163,11 +163,17 @@ module Redmine
       #   :per_page_links    if set to false, the "Per page" links are not rendered
       #
       def pagination_links_full(*args)
+        page = ""
         pagination_links_each(*args) do |text, parameters, options|
           if block_given?
           yield text, parameters, options
           else
-            link_to text, params.merge(parameters), options
+            if args[2][:path].nil?
+              link_to text, params.merge(parameters), options
+            else
+              page = "&page" + parameters[:page].to_s unless parameters[:page].nil?
+              link_to text, args[2][:path].to_s + page, options
+            end
           end
         end
       end

From 90fd52970bff03449fcf179cfde7d77afeff85c3 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 29 Mar 2016 10:15:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20bugger=20on=20=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |   7 +
 .../users/_resource_share_for_orgs.html.erb   |   2 +-
 ..._resource_share_for_project_popup.html.erb | 108 ++++++------
 .../users/_resource_share_popup.html.erb      | 112 ++++++------
 app/views/users/_resources_list.html.erb      | 164 ++++++++++++++++++
 app/views/users/_user_resource_info.html.erb  | 163 -----------------
 .../users/add_exist_file_to_course.js.erb     |   1 +
 app/views/users/add_exist_file_to_org.js.erb  |   1 +
 .../users/add_exist_file_to_project.js.erb    |   1 +
 app/views/users/search_user_course.js.erb     |   2 +-
 app/views/users/search_user_org.js.erb        |  28 +--
 app/views/users/search_user_project.js.erb    |  32 ++--
 app/views/users/user_resource_create.js.erb   |   1 -
 app/views/users/user_resource_delete.js.erb   |  26 +--
 14 files changed, 329 insertions(+), 319 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1cf4534bb..efe968d3b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1679,6 +1679,7 @@ class UsersController < ApplicationController
     end
     @status = params[:status]
     @type = params[:type]
+    @path = user_resource_user_path(User.current, :type => @type)
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
@@ -1703,6 +1704,7 @@ class UsersController < ApplicationController
       .select { |course|  @user.allowed_to?(:as_teacher,course)  and course.is_delete == 0 }
     end
     @search = params[:search]
+    @type = params[:type]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids]
@@ -1721,6 +1723,7 @@ class UsersController < ApplicationController
       @projects = @user.projects.visible
     end
     @search = params[:search]
+    @type = params[:type]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids] #搜索的时候  和 直接 用表格提交的时候的send_ids
@@ -1822,6 +1825,7 @@ class UsersController < ApplicationController
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -1933,6 +1937,7 @@ class UsersController < ApplicationController
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -2031,6 +2036,7 @@ class UsersController < ApplicationController
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -2723,6 +2729,7 @@ class UsersController < ApplicationController
     name = "%"+name+"%"
     @orgs = User.current.organizations.where("name like ?", name)
     @user = User.current
+    @type = params[:type]
     respond_to do |format|
       format.html {render :layout => 'static_base'}
       format.js
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 792db7546..166d0f82b 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -18,7 +18,7 @@
   <% end %>
     <div class="cl"></div>
 </div>
-<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => type),:remote=>true,:id=>'orgs_list_form' do %>
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
   <div class="sectionWrap fl mr15">
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index 33fa03061..aa42b22cc 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -1,54 +1,54 @@
-<div class="boxContainer">
-  <div>
-    <div class="sendText fl mr10" style="width: auto">发送到</div>
-    <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file');">
-        <option value="1">课程</option>
-        <option value="2" selected>项目</option>
-        <option value="3">组织</option>
-      </select>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-  <div class="fl">
-    <%= form_tag  search_user_project_user_path(user),:method => 'get',
-                  :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
-      <input type="text" id="search_project_input" value="<%= @search %>" name="search" placeholder="输入项目ID或者名称搜索" class="searchResourcePopup" />
-        <script>
-            observeSearchfieldOnInput('search_project_input','<%= search_user_project_user_path(user)%>','<%= send_id %>','<%= send_ids %>','file')
-        </script>
-      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
-        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
-    <% end %>
-  </div>
-  <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-    <% if !projects.empty?  %>
-        <% projects.each do |project| %>
-        <ul class="courseSend">
-          <li class="" style="display:inline-block">
-            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-          </li>
-          <li class="sendCourseName"><%= project.name%></li>
-        </ul>
-        <% end %>
-    </div>
-  </div>
-  <div>
-    <div class="courseSendSubmit">
-      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-    </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-  </div>
-  <div class="cl"></div>
-    <% end %>
-</div>
-
+<div class="boxContainer">
+  <div>
+    <div class="sendText fl mr10" style="width: auto">发送到</div>
+    <div class="resourcesSendTo">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file');">
+        <option value="1">课程</option>
+        <option value="2" selected>项目</option>
+        <option value="3">组织</option>
+      </select>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+  <div class="fl">
+    <%= form_tag  search_user_project_user_path(user),:method => 'get',
+                  :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= hidden_field_tag(:send_ids, send_ids) %>
+      <input type="text" id="search_project_input" value="<%= @search %>" name="search" placeholder="输入项目ID或者名称搜索" class="searchResourcePopup" />
+        <script>
+            observeSearchfieldOnInput('search_project_input','<%= search_user_project_user_path(user)%>','<%= send_id %>','<%= send_ids %>','file')
+        </script>
+      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
+        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
+    <% end %>
+  </div>
+  <%= form_tag add_exist_file_to_project_user_path(user, :type => type), :remote => true, :id=>'projects_list_form' %>
+  <div>
+
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="courseReferContainer">
+    <% if !projects.empty?  %>
+        <% projects.each do |project| %>
+        <ul class="courseSend">
+          <li class="" style="display:inline-block">
+            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+          </li>
+          <li class="sendCourseName"><%= project.name%></li>
+        </ul>
+        <% end %>
+    </div>
+  </div>
+  <div>
+    <div class="courseSendSubmit">
+      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+    </div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+  </div>
+  <div class="cl"></div>
+    <% end %>
+</div>
+
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 74265cabb..ba0eeb21e 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -1,56 +1,56 @@
-
-
-<div class="boxContainer">
-  <div>
-    <div class="sendText fl mr10" style="width: auto">发送到</div>
-    <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file');">
-        <option value="1">课程</option>
-        <option value="2">项目</option>
-        <option value="3">组织</option>
-      </select>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-  <div class="fl">
-    <%= form_tag  search_user_course_user_path(user),:method => 'get',
-                  :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
-      <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
-        <script>
-            observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','file')
-        </script>
-      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
-        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
-    <% end %>
-  </div>
-  <%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-      <div>
-
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
-        <div class="courseReferContainer">
-        <% if !courses.empty?  %>
-            <% courses.each do |course| %>
-            <ul class="courseSend">
-              <li class="" style="display:inline-block">
-                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-              </li>
-              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-            </ul>
-            <% end %>
-          </div>
-      </div>
-      <div>
-        <div class="courseSendSubmit">
-          <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-          <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-        </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-      </div>
-      <div class="cl"></div>
-  <% end %>
-</div>
-
+
+
+<div class="boxContainer">
+  <div>
+    <div class="sendText fl mr10" style="width: auto">发送到</div>
+    <div class="resourcesSendTo">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file');">
+        <option value="1">课程</option>
+        <option value="2">项目</option>
+        <option value="3">组织</option>
+      </select>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+  <div class="fl">
+    <%= form_tag  search_user_course_user_path(user),:method => 'get',
+                  :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= hidden_field_tag(:send_ids, send_ids) %>
+      <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
+        <script>
+            observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','file')
+        </script>
+      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
+        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
+    <% end %>
+  </div>
+  <%= form_tag add_exist_file_to_course_user_path(user, :type => type),:remote=>true,:id=>'course_list_form' %>
+      <div>
+
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= hidden_field_tag(:send_ids, send_ids) %>
+        <div class="courseReferContainer">
+        <% if !courses.empty?  %>
+            <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
+            </ul>
+            <% end %>
+          </div>
+      </div>
+      <div>
+        <div class="courseSendSubmit">
+          <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+          <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+        </div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+      </div>
+      <div class="cl"></div>
+  <% end %>
+</div>
+
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 69b512653..b8551f7c5 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -28,4 +28,168 @@
 
 <script>
 
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            return;
+        }
+
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id) %>' + "?send_id=" + id + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + "?send_id=" + id + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                data:{send_type:'file'}
+            });
+
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
+        });
+    }
+
+
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.ajax({
+                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                        {
+                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                last_line.children().eq(1).html(res_link);
+                                last_line.children().eq(1).children().attr('title', name);
+                                last_line.children().eq(1).children().attr('href', data);
+                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                            } else {
+                                last_line.children().eq(1).html(res_link);
+                                res_link = null; //如果修改失败，恢复之后将res_link置空
+                            }
+                        }
+                    } );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(line.children().first().children().data('hasHistory') == 'Y'){
+            alert('该资源存在历史版本，不能删除');
+            return;
+        }
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
 </script>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 0a3f94bb3..a3bc45481 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -207,93 +207,6 @@
             $("#res_count").html(0);
         }
     }
-
-    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-    }
-    //批量删除
-    function batch_delete(){
-        var data = $("#resources_list_form").serialize();
-        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
-            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
-            return;
-        }
-        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
-            alert("您只能删除自己上传的资源，请重新选择后再删除。");
-            return;
-        }
-
-        if(data != "" && confirm('确认要删除这些资源吗？')) {
-            $.post(
-                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
-                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
-                    function (data) {
-
-                    }
-            );
-        }
-    }
-
-
-
-    function show_send(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }
-    }
-
-    function batch_send(){
-        if($("#resources_list_form").serialize() == ""){
-            alert('暂时不支持多页选择，您当前页没有选择任何资源');
-            return ;
-        }
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-
-        }
-    }
-
-    function preview(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        $.ajax({
-            type:'get',
-            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
-        });
-    }
-
     function rename(){
         $("#contextMenu").hide();
         document.oncontextmenu = function() {return true;}
@@ -315,80 +228,4 @@
             alert('您无法修改此资源！')
         }
     }
-    String.prototype.trim = function() {
-        var str = this,
-                str = str.replace(/^\s\s*/, ''),
-                ws = /\s/,
-                i = str.length;
-        while (ws.test(str.charAt(--i)));
-        return str.slice(0, i + 1);
-    }
-
-
-
-    //恢复编辑状态到链接状态
-    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
-    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
-    function restore(){
-        //上一行不为空 且链接不为空
-        if( last_line != null && res_link != null && res_link != '') {
-            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
-            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
-                return;
-            }
-            if( name && name != res_name.trim()){
-
-                if(confirm('确定修改为 '+name)){
-                    $.ajax({
-                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
-                        type:'get',
-                        success:function (data)
-                        {
-                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                last_line.children().eq(1).html(res_link);
-                                last_line.children().eq(1).children().attr('title', name);
-                                last_line.children().eq(1).children().attr('href', data);
-                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
-                            } else {
-                                last_line.children().eq(1).html(res_link);
-                                res_link = null; //如果修改失败，恢复之后将res_link置空
-                            }
-                        }
-                    } );
-                }else{
-                    last_line.children().eq(1).html(res_link);
-                    res_link = null; //如果没有做修改，恢复之后将res_link置空
-                }
-            }else {
-                last_line.children().eq(1).html(res_link);
-                res_link = null;//如果没有做修改，恢复之后将res_link置空
-            }
-
-
-        }
-    }
-
-    function delete_file() {
-        $("#contextMenu").hide();
-        document.oncontextmenu = function () {
-            return true;
-        }
-        line.children().css("background-color", 'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(line.children().first().children().data('hasHistory') == 'Y'){
-            alert('该资源存在历史版本，不能删除');
-            return;
-        }
-        if(user_id === '<%= User.current.id%>') {
-            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
-                $.ajax({
-                    type: 'post',
-                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
 </script>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index c05a2ebd0..8db83aefc 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,6 +1,7 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_org.js.erb b/app/views/users/add_exist_file_to_org.js.erb
index 9bfe1230a..c6e7f4011 100644
--- a/app/views/users/add_exist_file_to_org.js.erb
+++ b/app/views/users/add_exist_file_to_org.js.erb
@@ -1,6 +1,7 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index ed38fa066..4c24f4932 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,6 +1,7 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index f4509987f..5556d3c92 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -12,7 +12,7 @@
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids, :type => @type}) %>');
 <% elsif params[:send_type] == 'message' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index ee12e9439..7461dbfda 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -1,15 +1,15 @@
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% elsif params[:send_type] == 'message' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-var val =  $("#search_org_input").val();
+<% if params[:send_type].present? && params[:send_type] == 'news' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+<% elsif params[:send_type] == 'file' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids, :type => @type})%>');
+<% elsif params[:send_type] == 'message' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+<% end %>
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+var val =  $("#search_org_input").val();
 $("#search_org_input").val("").focus().val(val);
\ No newline at end of file
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index d58c56ca9..50a194814 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,16 +1,16 @@
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'message' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-//$("#search_project_input").focus();
-var val =  $("#search_project_input").val();
-$("#search_project_input").val("").focus().val(val);
+<% if params[:send_type].present? && params[:send_type] == 'news' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% elsif params[:send_type] == 'file' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids, :type => @type}) %>');
+<% elsif params[:send_type] == 'message' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% end %>
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+//$("#search_project_input").focus();
+var val =  $("#search_project_input").val();
+$("#search_project_input").val("").focus().val(val);
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index cc7e543c8..d28898e0a 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,7 +1,6 @@
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
-debugger
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb
index 9583274c6..ffb056e28 100644
--- a/app/views/users/user_resource_delete.js.erb
+++ b/app/views/users/user_resource_delete.js.erb
@@ -1,14 +1,14 @@
-$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html(<%= @atta_count%>);
-$("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
-//更新状态
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
-$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
-$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
-$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
-$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#res_all_count").html(<%= @atta_count%>);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
 $("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file