jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改资源区分页问题

This commit is contained in:
alan 2016-03-29 15:46:13 +08:00
parent 56f8d4854b
commit 03d855f5d5
4 changed files with 346 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/users/_course_file_form.html.erb
View File

@ -1,4 +1,5 @@
<%= form_tag add_exist_file_to_course_user_path(user, :type => defined? type ? "6" : type ),:remote=>true,:id=>'course_list_form' do %>
<%= form_tag add_exist_file_to_course_user_path(user, :type => defined?(type) ? type : "6" ),:remote=>true,:id=>'course_list_form' do %>
<div> <div>
<%= hidden_field_tag(:send_id, send_id) %> <%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %> <%= hidden_field_tag(:send_ids, send_ids) %>

2
app/views/users/_org_file_form.html.erb
View File

@ -1,4 +1,4 @@
<%= form_tag add_exist_file_to_org_user_path(user, :type => defined? type ? "6" : type),:remote=>true,:id=>'orgs_list_form' do %> <%= form_tag add_exist_file_to_org_user_path(user, :type => defined?(type) ? type : "6" ),:remote=>true,:id=>'orgs_list_form' do %>
<%= hidden_field_tag(:send_id, send_id) %> <%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %> <%= hidden_field_tag(:send_ids, send_ids) %>
<div class="sectionWrap fl mr15"> <div class="sectionWrap fl mr15">

2
app/views/users/_project_file_form.html.erb
View File

@ -1,4 +1,4 @@
<%= form_tag add_exist_file_to_project_user_path(user, :type => defined? type ? "6" : type), :remote => true, :id => 'projects_list_form' %> <%= form_tag add_exist_file_to_project_user_path(user, :type => defined?(type) ? type : "6" ), :remote => true, :id => 'projects_list_form' %>
<div> <div>
<%= hidden_field_tag(:send_id, send_id) %> <%= hidden_field_tag(:send_id, send_id) %>
<%= hidden_field_tag(:send_ids, send_ids) %> <%= hidden_field_tag(:send_ids, send_ids) %>

684
lib/redmine/pagination.rb
View File

@ -1,342 +1,342 @@
# encoding: utf-8 # encoding: utf-8
# #
# Redmine - project management software # Redmine - project management software
# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2006-2013 Jean-Philippe Lang
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
module Redmine module Redmine
module Pagination module Pagination
class Paginator class Paginator
attr_reader :item_count, :per_page, :page, :page_param attr_reader :item_count, :per_page, :page, :page_param
def initialize(*args) def initialize(*args)
if args.first.is_a?(ActionController::Base) if args.first.is_a?(ActionController::Base)
args.shift args.shift
ActiveSupport::Deprecation.warn "Paginator no longer takes a controller instance as the first argument. Remove it from #new arguments." ActiveSupport::Deprecation.warn "Paginator no longer takes a controller instance as the first argument. Remove it from #new arguments."
end end
item_count, per_page, page, page_param = *args item_count, per_page, page, page_param = *args
@item_count = item_count @item_count = item_count
@per_page = per_page @per_page = per_page
page = (page || 1).to_i page = (page || 1).to_i
if page < 1 if page < 1
page = 1 page = 1
end end
@page = page @page = page
@page_param = page_param || :page @page_param = page_param || :page
end end
def offset def offset
(page - 1) * per_page (page - 1) * per_page
end end
## fq ## fq
def reverse_offset def reverse_offset
offset = @item_count-@per_page*page offset = @item_count-@per_page*page
if offset < 0 if offset < 0
offset = 0 offset = 0
end end
offset offset
end end
## end ## end
def first_page def first_page
if item_count > 0 if item_count > 0
1 1
end end
end end
def previous_page def previous_page
if page > 1 if page > 1
page - 1 page - 1
end end
end end
def next_page def next_page
if last_item < item_count if last_item < item_count
page + 1 page + 1
end end
end end
def last_page def last_page
if item_count > 0 if item_count > 0
(item_count - 1) / per_page + 1 (item_count - 1) / per_page + 1
end end
end end
def first_item def first_item
item_count == 0 ? 0 : (offset + 1) item_count == 0 ? 0 : (offset + 1)
end end
def last_item def last_item
l = first_item + per_page - 1 l = first_item + per_page - 1
l > item_count ? item_count : l l > item_count ? item_count : l
end end
def linked_pages def linked_pages
pages = [] pages = []
if item_count > 0 if item_count > 0
pages += [first_page, page, last_page] pages += [first_page, page, last_page]
pages += ((page-2)..(page+2)).to_a.select {|p| p > first_page && p < last_page} pages += ((page-2)..(page+2)).to_a.select {|p| p > first_page && p < last_page}
end end
pages = pages.compact.uniq.sort pages = pages.compact.uniq.sort
if pages.size > 1 if pages.size > 1
pages pages
else else
[] []
end end
end end
def items_per_page def items_per_page
ActiveSupport::Deprecation.warn "Paginator#items_per_page will be removed. Use #per_page instead." ActiveSupport::Deprecation.warn "Paginator#items_per_page will be removed. Use #per_page instead."
per_page per_page
end end
def current def current
ActiveSupport::Deprecation.warn "Paginator#current will be removed. Use .offset instead of .current.offset." ActiveSupport::Deprecation.warn "Paginator#current will be removed. Use .offset instead of .current.offset."
self self
end end
end end
# Paginates the given scope or model. Returns a Paginator instance and # Paginates the given scope or model. Returns a Paginator instance and
# the collection of objects for the current page. # the collection of objects for the current page.
# #
# Options: # Options:
# :parameter name of the page parameter # :parameter name of the page parameter
# #
# Examples: # Examples:
# @user_pages, @users = paginate User.where(:status => 1) # @user_pages, @users = paginate User.where(:status => 1)
# #
def paginate(scope, options={}) def paginate(scope, options={})
options = options.dup options = options.dup
finder_options = options.extract!( finder_options = options.extract!(
:conditions, :conditions,
:order, :order,
:joins, :joins,
:include, :include,
:select :select
) )
if scope.is_a?(Symbol) || finder_options.values.compact.any? if scope.is_a?(Symbol) || finder_options.values.compact.any?
return deprecated_paginate(scope, finder_options, options) return deprecated_paginate(scope, finder_options, options)
end end
paginator = paginator(scope.count, options) paginator = paginator(scope.count, options)
collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a collection = scope.limit(paginator.per_page).offset(paginator.offset).to_a
return paginator, collection return paginator, collection
end end
def deprecated_paginate(arg, finder_options, options={}) def deprecated_paginate(arg, finder_options, options={})
ActiveSupport::Deprecation.warn "#paginate with a Symbol and/or find options is depreceted and will be removed. Use a scope instead." ActiveSupport::Deprecation.warn "#paginate with a Symbol and/or find options is depreceted and will be removed. Use a scope instead."
klass = arg.is_a?(Symbol) ? arg.to_s.classify.constantize : arg klass = arg.is_a?(Symbol) ? arg.to_s.classify.constantize : arg
scope = klass.scoped(finder_options) scope = klass.scoped(finder_options)
paginate(scope, options) paginate(scope, options)
end end
def paginator(item_count, options={}) def paginator(item_count, options={})
options.assert_valid_keys :parameter, :per_page options.assert_valid_keys :parameter, :per_page
page_param = options[:parameter] || :page page_param = options[:parameter] || :page
page = (params[page_param] || 1).to_i page = (params[page_param] || 1).to_i
per_page = options[:per_page] || per_page_option per_page = options[:per_page] || per_page_option
Paginator.new(item_count, per_page, page, page_param) Paginator.new(item_count, per_page, page, page_param)
end end
module Helper module Helper
include Redmine::I18n include Redmine::I18n
# Renders the pagination links for the given paginator. # Renders the pagination links for the given paginator.
# #
# Options: # Options:
# :per_page_links if set to false, the "Per page" links are not rendered # :per_page_links if set to false, the "Per page" links are not rendered
# #
def pagination_links_full(*args) def pagination_links_full(*args)
page = "" page = ""
pagination_links_each(*args) do |text, parameters, options| pagination_links_each(*args) do |text, parameters, options|
if block_given? if block_given?
yield text, parameters, options yield text, parameters, options
else else
if args[2][:path].nil? if args[2][:path].nil?
link_to text, params.merge(parameters), options link_to text, params.merge(parameters), options
else else
page = "&page" + parameters[:page].to_s unless parameters[:page].nil? page = "&page=" + parameters[:page].to_s unless parameters[:page].nil?
link_to text, args[2][:path].to_s + page, options link_to text, args[2][:path].to_s + page, options
end end
end end
end end
end end
# Yields the given block with the text and parameters # Yields the given block with the text and parameters
# for each pagination link and returns a string that represents the links # for each pagination link and returns a string that represents the links
# def pagination_links_each(paginator, count=nil, options={}, &block) # def pagination_links_each(paginator, count=nil, options={}, &block)
# options.assert_valid_keys :per_page_links # options.assert_valid_keys :per_page_links
# #
# per_page_links = options.delete(:per_page_links) # per_page_links = options.delete(:per_page_links)
# per_page_links = false if count.nil? # per_page_links = false if count.nil?
# page_param = paginator.page_param # page_param = paginator.page_param
# #
# html = '' # html = ''
# if paginator.previous_page # if paginator.previous_page
# # \xc2\xab(utf-8) = &#171; # # \xc2\xab(utf-8) = &#171;
# text = "\xc2\xab " + l(:label_previous) # text = "\xc2\xab " + l(:label_previous)
# html << yield(text, {page_param => paginator.previous_page}, :class => 'previous') + ' ' # html << yield(text, {page_param => paginator.previous_page}, :class => 'previous') + ' '
# end # end
# #
# previous = nil # previous = nil
# paginator.linked_pages.each do |page| # paginator.linked_pages.each do |page|
# if previous && previous != page - 1 # if previous && previous != page - 1
# html << content_tag('span', '...', :class => 'spacer') + ' ' # html << content_tag('span', '...', :class => 'spacer') + ' '
# end # end
# if page == paginator.page # if page == paginator.page
# html << content_tag('span', page.to_s, :class => 'current page') # html << content_tag('span', page.to_s, :class => 'current page')
# else # else
# html << yield(page.to_s, {page_param => page}, :class => 'page') # html << yield(page.to_s, {page_param => page}, :class => 'page')
# end # end
# html << ' ' # html << ' '
# previous = page # previous = page
# end # end
# #
# if paginator.next_page # if paginator.next_page
# # \xc2\xbb(utf-8) = &#187; # # \xc2\xbb(utf-8) = &#187;
# text = l(:label_next) + " \xc2\xbb" # text = l(:label_next) + " \xc2\xbb"
# html << yield(text, {page_param => paginator.next_page}, :class => 'next') + ' ' # html << yield(text, {page_param => paginator.next_page}, :class => 'next') + ' '
# end # end
# #
# html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' ' # html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
# #
# if per_page_links != false && links = per_page_links(paginator, &block) # if per_page_links != false && links = per_page_links(paginator, &block)
# html << content_tag('span', links.to_s, :class => 'per-page') # html << content_tag('span', links.to_s, :class => 'per-page')
# end # end
# #
# html.html_safe # html.html_safe
# end # end
#Added by Nie guanghui #Added by Nie guanghui
#Designed for pagination. #Designed for pagination.
def pagination_links_each(paginator, count=nil, options={}, &block) def pagination_links_each(paginator, count=nil, options={}, &block)
#options.assert_valid_keys :per_page_links #options.assert_valid_keys :per_page_links
#per_page_links = options.delete(:per_page_links) #per_page_links = options.delete(:per_page_links)
per_page_links = options[:per_page_links] per_page_links = options[:per_page_links]
remote = options[:remote] ? options[:remote] : false remote = options[:remote] ? options[:remote] : false
flag = options[:flag] ? options[:flag] : false flag = options[:flag] ? options[:flag] : false
per_page_links = false if count.nil? per_page_links = false if count.nil?
page_param = paginator.page_param page_param = paginator.page_param
html = '' html = ''
if paginator.previous_page if paginator.previous_page
# \xc2\xab(utf-8) = &#171; # \xc2\xab(utf-8) = &#171;
if flag if flag
text = l(:label_previous) text = l(:label_previous)
else else
text = "\xc2\xab " + l(:label_previous) text = "\xc2\xab " + l(:label_previous)
end end
html << '<li>' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' ' html << '<li>' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' '
end end
unless paginator.previous_page unless paginator.previous_page
if paginator.next_page if paginator.next_page
if flag if flag
text = l(:label_previous) text = l(:label_previous)
else else
text = "\xc2\xab " + l(:label_previous) text = "\xc2\xab " + l(:label_previous)
end end
html << '<li>' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' ' html << '<li>' << yield(text, {page_param => paginator.previous_page}, :class => 'previous c_blue', :remote => remote) << '</li>' + ' '
end end
end end
previous = nil previous = nil
paginator.linked_pages.each do |page| paginator.linked_pages.each do |page|
if previous && previous != page - 1 if previous && previous != page - 1
if flag if flag
html << '<li>' << content_tag('a', '...', :class => 'c_blue') << '</li>' + ' ' html << '<li>' << content_tag('a', '...', :class => 'c_blue') << '</li>' + ' '
else else
html << '<li>' << content_tag('span', '...', :class => 'spacer ') << '</li>' + ' ' html << '<li>' << content_tag('span', '...', :class => 'spacer ') << '</li>' + ' '
end end
end end
if page == paginator.page if page == paginator.page
if flag if flag
html << '<li class = "wlist_select">' << content_tag('a', page.to_s, :class => 'current-page c_white') << '</li>' html << '<li class = "wlist_select">' << content_tag('a', page.to_s, :class => 'current-page c_white') << '</li>'
else else
html << '<li>' << content_tag('span', page.to_s, :class => 'current-page') << '</li>' html << '<li>' << content_tag('span', page.to_s, :class => 'current-page') << '</li>'
end end
else else
html << '<li>' << yield(page.to_s, {page_param => page}, :class => 'page c_blue', :remote => remote) << '</li>' html << '<li>' << yield(page.to_s, {page_param => page}, :class => 'page c_blue', :remote => remote) << '</li>'
end end
html << ' ' html << ' '
previous = page previous = page
end end
if paginator.next_page if paginator.next_page
if flag if flag
text = l(:label_next) text = l(:label_next)
else else
text = l(:label_next) + " \xc2\xbb" text = l(:label_next) + " \xc2\xbb"
end end
html << '<li>' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << '</li>' + ' ' html << '<li>' << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << '</li>' + ' '
end end
unless paginator.next_page unless paginator.next_page
if paginator.previous_page if paginator.previous_page
if flag if flag
text = l(:label_next) text = l(:label_next)
else else
text = l(:label_next) + " \xc2\xbb" text = l(:label_next) + " \xc2\xbb"
end end
html << "<li>" << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << "</li>" + ' ' html << "<li>" << yield(text, {page_param => paginator.next_page}, :class => 'next c_blue', :remote => remote) << "</li>" + ' '
end end
end end
# html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' ' # html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' '
# #
# if per_page_links != false && links = per_page_links(paginator, &block) # if per_page_links != false && links = per_page_links(paginator, &block)
# html << content_tag('span', links.to_s, :class => 'per-page') # html << content_tag('span', links.to_s, :class => 'per-page')
# end # end
html.html_safe html.html_safe
end end
# Renders the "Per page" links. # Renders the "Per page" links.
def per_page_links(paginator, &block) def per_page_links(paginator, &block)
values = per_page_options(paginator.per_page, paginator.item_count) values = per_page_options(paginator.per_page, paginator.item_count)
if values.any? if values.any?
links = values.collect do |n| links = values.collect do |n|
if n == paginator.per_page if n == paginator.per_page
content_tag('span', n.to_s) content_tag('span', n.to_s)
else else
yield(n, :per_page => n, paginator.page_param => nil) yield(n, :per_page => n, paginator.page_param => nil)
end end
end end
l(:label_display_per_page, links.join(', ')).html_safe l(:label_display_per_page, links.join(', ')).html_safe
end end
end end
def per_page_options(selected=nil, item_count=nil) def per_page_options(selected=nil, item_count=nil)
options = Setting.per_page_options_array options = Setting.per_page_options_array
if item_count && options.any? if item_count && options.any?
if item_count > options.first if item_count > options.first
max = options.detect {|value| value >= item_count} || item_count max = options.detect {|value| value >= item_count} || item_count
else else
max = item_count max = item_count
end end
options = options.select {|value| value <= max || value == selected} options = options.select {|value| value <= max || value == selected}
end end
if options.empty? || (options.size == 1 && options.first == selected) if options.empty? || (options.size == 1 && options.first == selected)
[] []
else else
options options
end end
end end
end end
end end
end end