Makes all pagination-like links use #link_to_content_update (#5138).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5301 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
7bca8c4212
commit
0f0fbeb26d
7 files changed
+26
-47
No files matched your search
@@ -338,15 +338,15 @@ module ApplicationHelper
|
||||
|
||||
html = ''
|
||||
if paginator.current.previous
|
||||
html << link_to_remote_content_update('« ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
|
||||
html << link_to_content_update('« ' + l(:label_previous), url_param.merge(page_param => paginator.current.previous)) + ' '
|
||||
end
|
||||
|
||||
html << (pagination_links_each(paginator, options) do |n|
|
||||
link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
|
||||
link_to_content_update(n.to_s, url_param.merge(page_param => n))
|
||||
end || '')
|
||||
|
||||
if paginator.current.next
|
||||
html << ' ' + link_to_remote_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next))
|
||||
html << ' ' + link_to_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next))
|
||||
end
|
||||
|
||||
unless count.nil?
|
||||
@@ -361,10 +361,7 @@ module ApplicationHelper
|
||||
|
||||
def per_page_links(selected=nil)
|
||||
links = Setting.per_page_options_array.collect do |n|
|
||||
n == selected ? n : link_to_remote(n, {:update => "content",
|
||||
:url => params.merge(:per_page => n),
|
||||
:method => :get},
|
||||
{:href => url_for(params.merge(:per_page => n))})
|
||||
n == selected ? n : link_to_content_update(n, params.merge(:per_page => n))
|
||||
end
|
||||
links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
|
||||
end
|
||||
@@ -934,11 +931,10 @@ module ApplicationHelper
|
||||
return self
|
||||
end
|
||||
|
||||
def link_to_remote_content_update(text, url_params)
|
||||
def link_to_content_update(text, url_params = {}, html_options = {})
|
||||
link_to_remote(text,
|
||||
{:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'},
|
||||
{:href => url_for(:params => url_params)}
|
||||
{:href => url_for(:params => url_params)}.merge(html_options)
|
||||
)
|
||||
end
|
||||
|
||||
end
|
||||
Reference in new issue
Block a user