diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-12 22:01:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-02-12 22:01:20 +0000 |
| commit | 9586269a06a046ed60ed605028479ff6f9b1326a (patch) | |
| tree | f889ba96ef975d277e87485d4bfa9220cbfa087e /app/views | |
| parent | ff9da0bab038ea118b839dd2d9e93a4d1a37e274 (diff) | |
| download | redmine-9586269a06a046ed60ed605028479ff6f9b1326a.tar.gz redmine-9586269a06a046ed60ed605028479ff6f9b1326a.zip | |
Issues pagination loses project param after applying or clearing filter (#2726).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2459 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/index.rhtml | 4 | ||||
| -rw-r--r-- | app/views/queries/_filters.rhtml | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml index 64592a5a8..dc93e41f2 100644 --- a/app/views/issues/index.rhtml +++ b/app/views/issues/index.rhtml @@ -3,7 +3,7 @@ <% html_title(l(:label_issue_plural)) %> <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> - <%= hidden_field_tag('project_id', @project.id) if @project %> + <%= hidden_field_tag('project_id', @project.to_param) if @project %> <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend> <%= render :partial => 'queries/filters', :locals => {:query => @query} %> <p class="buttons"> @@ -14,7 +14,7 @@ }, :class => 'icon icon-checked' %> <%= link_to_remote l(:button_clear), - { :url => { :set_filter => 1, :project_id => (@project.nil? ? nil : @project.id) }, + { :url => { :set_filter => 1, :project_id => @project }, :method => :get, :update => "content", }, :class => 'icon icon-reload' %> diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml index c9d612364..b25cd01aa 100644 --- a/app/views/queries/_filters.rhtml +++ b/app/views/queries/_filters.rhtml @@ -95,7 +95,10 @@ function toggle_multi_select(field) { </td> <td class="add-filter"> <%= l(:label_filter_add) %>: -<%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %> +<%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), + :onchange => "add_filter();", + :class => "select-small", + :name => nil %> </td> </tr> </table> |