diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3149b0fb4..ddc7ec38d 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1266,6 +1266,12 @@ class UsersController < ApplicationController end end @type = params[:type] + @limit = 10 + @obj_count = @attachments.count + @obj_pages = Paginator.new @obj_count, @limit, params['page'] || 1 + @offset ||= @obj_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,10 respond_to do |format| format.js format.html {render :layout => 'base_users_new'} @@ -1308,6 +1314,12 @@ class UsersController < ApplicationController end end @type = params[:type] + @limit = 10 + @obj_count = @attachments.count + @obj_pages = Paginator.new @obj_count, @limit, params['page'] || 1 + @offset ||= @obj_pages.offset + #@curse_attachments_all = @all_attachments[@offset, @limit] + @attachments = paginateHelper @attachments,10 respond_to do |format| format.js end diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb index 7d880da69..91002244a 100644 --- a/app/views/users/search_user_course.js.erb +++ b/app/views/users/search_user_course.js.erb @@ -1,11 +1,11 @@ -var screenWidth = $(window).width(); -var screenHeight = $(window).height(); //当前浏览器窗口的 宽高 -var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 -var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 -var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 +//var screenWidth = $(window).width(); +//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高 +//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 +//var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 +//var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 var popupHeight = $(".resourceSharePopup").outerHeight(true); $(".resourceSharePopup").css("marginTop",-popupHeight/2); -$("#upload_box").css('left',objLeft).css('top',objTop); +$("#upload_box").css('left','').css('top',''); $("#upload_box").html('<%= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); $("#upload_box").css('display','block'); \ 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 556534560..ee224970f 100644 --- a/app/views/users/search_user_project.js.erb +++ b/app/views/users/search_user_project.js.erb @@ -1,11 +1,11 @@ -var screenWidth = $(window).width(); -var screenHeight = $(window).height(); //当前浏览器窗口的 宽高 -var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 -var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 -var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 +//var screenWidth = $(window).width(); +//var screenHeight = $(window).height(); //当前浏览器窗口的 宽高 +//var scrolltop = $(document).scrollTop();//获取当前窗口距离页面顶部高度 +//var objLeft = (screenWidth - 2)/2.5 ; //2 可以根据需要修改 +//var objTop = (screenHeight - 100)/2 + scrolltop; //100可以根据需要修改 var popupHeight = $(".resourceSharePopup").outerHeight(true); $(".resourceSharePopup").css("marginTop",-popupHeight/2); -$("#upload_box").css('left',objLeft).css('top',objTop); +$("#upload_box").css('left','').css('top',''); $("#upload_box").html('<%= escape_javascript( render :partial => "resource_share_for_project_popup" ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>'); $("#upload_box").css('display','block'); \ No newline at end of file diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index 9565f7e38..20951471a 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -103,6 +103,10 @@ + +
@@ -284,6 +288,9 @@ $(".resourcesList").click(function(e) { } function batch_send(){ + if($("#resources_list_form").serialize() == ""){ + return ; + } if (lastSendType === '1'){ //如果已经发送过一次了,那么就应该沿用上次发送的类型。 $.ajax({ type: 'get', @@ -411,7 +418,7 @@ $(".resourcesList").click(function(e) { }); } }else{//如果是多个发送 - if (sendType === '1'){ //如果已经发送过一次了,那么就应该沿用上次发送的类型。 + if (sendType === '1'){ $.ajax({ type: 'get', url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()