kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Quick fix for: 

* 9750 sort field is lost, when displaying next part of issues list
* 9782 show issues in page is wrong

Still some problems, eg. status criteria is lost when paginating or sorting on users/list

git-svn-id: http://redmine.rubyforge.org/svn/trunk@406 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2007-04-03 17:46:05 +00:00
parent 568c22016a
commit 6d2ecefca0
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/application_helper.rb
View File

@ -77,18 +77,18 @@ module ApplicationHelper
def pagination_links_full(paginator, options={}, html_options={})
html = ''
html << link_to_remote(('&#171; ' + l(:label_previous)),
{:update => "content", :url => params.merge({ :page => paginator.current.previous })},
{:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
{:update => "content", :url => { :page => paginator.current.previous }},
{:href => url_for(:action => 'list', :params =>{:page => paginator.current.previous})}) + ' ' if paginator.current.previous
html << (pagination_links_each(paginator, options) do |n|
link_to_remote(n.to_s,
{:url => {:action => 'list', :params => params.merge({:page => n})}, :update => 'content'},
{:href => url_for(:action => 'list', :params => params.merge({:page => n}))})
{:url => {:action => 'list', :params => {:page => n}}, :update => 'content'},
{:href => url_for(:action => 'list', :params => {:page => n})})
end || '')
html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
{:update => "content", :url => params.merge({ :page => paginator.current.next })},
{:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.next}))}) if paginator.current.next
{:update => "content", :url => { :page => paginator.current.next }},
{:href => url_for(:action => 'list', :params => {:page => paginator.current.next})}) if paginator.current.next
html
end

8
app/helpers/sort_helper.rb
View File

@ -107,10 +107,12 @@ module SortHelper
order = 'desc' # changed for desc order by default
end
caption = titleize(Inflector::humanize(column)) unless caption
#params = {:params => {:sort_key => column, :sort_order => order}}
url = {:sort_key => column, :sort_order => order, :issue_id => params[:issue_id], :project_id => params[:project_id]}
link_to_remote(caption,
{:update => "content", :url => params.update( :sort_key => column, :sort_order => order)},
{:href => url_for(:params => params.update(:sort_key => column, :sort_order => order))}) +
{:update => "content", :url => url},
{:href => url_for(url)}) +
(icon ? nbsp(2) + image_tag(icon) : '')
end