diff options
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/application_helper.rb | 8 | ||||
| -rw-r--r-- | app/helpers/sort_helper.rb | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 397b747d5..5c28c2359 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -70,17 +70,17 @@ module ApplicationHelper html = ''
html << link_to_remote(('« ' + l(:label_previous)),
{:update => "content", :url => { :page => paginator.current.previous }},
- {:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.previous}))}) + ' ' if paginator.current.previous
+ {:href => url_for(:action => 'list', :params => params.merge({: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 => params.merge({:page => n})}, :update => 'content'},
+ {:href => url_for(:action => 'list', :params => params.merge({:page => n}))})
end || '')
html << ' ' + link_to_remote((l(:label_next) + ' »'),
{:update => "content", :url => { :page => paginator.current.next }},
- {:href => url_for(:action => 'list', :params => @params.merge({:page => paginator.current.next}))}) if paginator.current.next
+ {:href => url_for(:action => 'list', :params => params.merge({:page => paginator.current.next}))}) if paginator.current.next
html
end
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index 04a84c8e4..ec14ecbe1 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -61,7 +61,7 @@ module SortHelper # defaults to '<controller_name>_sort'. # def sort_init(default_key, default_order='asc', name=nil) - @sort_name = name || @params[:controller] + @params[:action] + '_sort' + @sort_name = name || params[:controller] + params[:action] + '_sort' @sort_default = {:key => default_key, :order => default_order} end @@ -69,21 +69,21 @@ module SortHelper # sort_clause. # def sort_update() - if @params[:sort_key] - sort = {:key => @params[:sort_key], :order => @params[:sort_order]} - elsif @session[@sort_name] - sort = @session[@sort_name] # Previous sort. + if params[:sort_key] + sort = {:key => params[:sort_key], :order => params[:sort_order]} + elsif session[@sort_name] + sort = session[@sort_name] # Previous sort. else sort = @sort_default end - @session[@sort_name] = sort + session[@sort_name] = sort end # Returns an SQL sort clause corresponding to the current sort state. # Use this to sort the controller's table items collection. # def sort_clause() - @session[@sort_name][:key] + ' ' + @session[@sort_name][:order] + session[@sort_name][:key] + ' ' + session[@sort_name][:order] end # Returns a link which sorts by the named column. @@ -93,7 +93,7 @@ module SortHelper # - A sort icon image is positioned to the right of the sort link. # def sort_link(column, caption=nil) - key, order = @session[@sort_name][:key], @session[@sort_name][:order] + key, order = session[@sort_name][:key], session[@sort_name][:order] if key == column if order.downcase == 'asc' icon = 'sort_asc' |