| @@ -200,8 +200,7 module SortHelper | |||||
| 200 | caption = column.to_s.humanize unless caption |
|
200 | caption = column.to_s.humanize unless caption | |
| 201 |
|
201 | |||
| 202 | sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param } |
|
202 | sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param } | |
| 203 | # don't reuse params if filters are present |
|
203 | url_options = params.merge(sort_options) | |
| 204 | url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options) |
|
|||
| 205 |
|
204 | |||
| 206 | # Add project_id to url_options |
|
205 | # Add project_id to url_options | |
| 207 | url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id) |
|
206 | url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id) | |
General Comments 0
You need to be logged in to leave comments.
Login now