@@ -204,36 +204,28 @@ module ApplicationHelper
url_param.clear if url_param.has_key?(:set_filter)
html = ''
- html << link_to_remote(('« ' + l(:label_previous)),
- {:update => 'content',
- :url => url_param.merge(page_param => paginator.current.previous),
- :method => :get,
- :complete => 'window.scrollTo(0,0)'},
- {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
+ if paginator.current.previous
+ html << link_to_remote_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(n.to_s,
- {:url => {:params => url_param.merge(page_param => n)},
- :method => :get,
- :update => 'content',
- :complete => 'window.scrollTo(0,0)'},
- {:href => url_for(:params => url_param.merge(page_param => n))})
+ link_to_remote_content_update(n.to_s, url_param.merge(page_param => n))
end || '')
-
- html << ' ' + link_to_remote((l(:label_next) + ' »'),
- {:update => 'content',
- :url => url_param.merge(page_param => paginator.current.next),
- :method => :get,
- :complete => 'window.scrollTo(0,0)'},
- {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
+
+ if paginator.current.next
+ html << ' ' + link_to_remote_content_update((l(:label_next) + ' »'), url_param.merge(page_param => paginator.current.next))
+ end
unless count.nil?
- html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
+ html << [
+ " (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})",
+ per_page_links(paginator.items_per_page)
+ ].compact.join(' | ')
end
html
end
-
+
def per_page_links(selected=nil)
url_param = params.dup
url_param.clear if url_param.has_key?(:set_filter)
@@ -630,4 +622,12 @@ module ApplicationHelper
extend helper
return self
end
+
+ def link_to_remote_content_update(text, url_params)
+ link_to_remote(text,
+ {:url => url_params, :method => :get, :update => 'content', :complete => 'window.scrollTo(0,0)'},
+ {:href => url_for(:params => url_params)}
+ )
+ end
+
end
app/helpers/application_helper.rb
25f8895fba0d3cc240e7df059474e471e965e992
Gerrit Kaiser
gerrit@gerritkaiser.de
http://github.com/tricycle/redmine/commit/9129b5cb3da925cd3d9075b2547dc6638f2d0c2e
9129b5cb3da925cd3d9075b2547dc6638f2d0c2e
2009-01-22T20:00:47-08:00
2009-01-22T19:58:26-08:00
refactored ajax link generation into separate method
d272a06de4ba524f68c73b648b356ff808162d0f
Gerrit Kaiser
gerrit@gerritkaiser.de