diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6b448199e..1aa8de526 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -933,13 +933,13 @@ class UsersController < ApplicationController end end @type = params[:type] || 1 - @limit = 10 + @limit = 15 @is_remote = true - @obj_count = @attachments.count - @obj_pages = Paginator.new @obj_count, @limit, params['page'] || 1 - @offset ||= @obj_pages.offset + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset #@curse_attachments_all = @all_attachments[@offset, @limit] - @attachments = paginateHelper @attachments,10 + @attachments = paginateHelper @attachments,15 respond_to do |format| format.js end @@ -989,13 +989,13 @@ class UsersController < ApplicationController end end @type = params[:type] - @limit = 10 + @limit = 15 @is_remote = true - @obj_count = @attachments.count - @obj_pages = Paginator.new @obj_count, @limit, params['page'] || 1 - @offset ||= @obj_pages.offset + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset #@curse_attachments_all = @all_attachments[@offset, @limit] - @attachments = paginateHelper @attachments,10 + @attachments = paginateHelper @attachments,15 respond_to do |format| format.js end @@ -1405,13 +1405,13 @@ class UsersController < ApplicationController end end @type = params[:type] - @limit = 10 + @limit = 15 @is_remote = true - @obj_count = @attachments.count - @obj_pages = Paginator.new @obj_count, @limit, params['page'] || 1 - @offset ||= @obj_pages.offset + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset #@curse_attachments_all = @all_attachments[@offset, @limit] - @attachments = paginateHelper @attachments,10 + @attachments = paginateHelper @attachments,15 respond_to do |format| format.js format.html {render :layout => 'base_users_new'} @@ -1457,13 +1457,13 @@ class UsersController < ApplicationController end end @type = params[:type] - @limit = 10 + @limit = 15 @is_remote = true - @obj_count = @attachments.count - @obj_pages = Paginator.new @obj_count, @limit, params['page'] || 1 - @offset ||= @obj_pages.offset + @atta_count = @attachments.count + @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1 + @offset ||= @atta_pages.offset #@curse_attachments_all = @all_attachments[@offset, @limit] - @attachments = paginateHelper @attachments,10 + @attachments = paginateHelper @attachments,15 respond_to do |format| format.js end diff --git a/app/views/users/resource_search.js.erb b/app/views/users/resource_search.js.erb index 1a7469f25..a956ed212 100644 --- a/app/views/users/resource_search.js.erb +++ b/app/views/users/resource_search.js.erb @@ -1,2 +1,2 @@ $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); -$("#pages").html('<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ No newline at end of file +$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>'); \ 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 f0be12e3d..3c4ea18ca 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -105,7 +105,7 @@