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

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
6d2ecefc · Jean-Philippe Lang · 568c2201 · 6d2ecefc · 6d2ecefc
Commit 6d2ecefc authored Apr 03, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

application_helper.rb app/helpers/application_helper.rb +6 -6

sort_helper.rb app/helpers/sort_helper.rb +5 -3

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -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
  

--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -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