jro_apps/redmine Commit - r2486:dc8b804eba9c

Fixed: export links on the issue list lose project param after applying a filter (#2908)....

Jean-Philippe Lang -

r2486:dc8b804eba9c

parent child

Context file:

r2486:dc8b804eba9c

Collapse all files

app/views/issues/index.rhtml +3 -3

             <% if @query.new_record? %>
                 <h2><%=l(:label_issue_plural)%></h2>
                 <% html_title(l(:label_issue_plural)) %>
                 <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
                 <%= 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">
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :set_filter => 1 },
                                      :update => "content",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-checked' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => { :set_filter => 1, :project_id => @project },
                                      :method => :get,
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
                 <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
                 <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
                 <% end %>
                 </p>
                 </fieldset>
                 <% end %>
             <% else %>
                 <div class="contextual">
                 <% if @query.editable_by?(User.current) %>
                 <%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
                 <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
                 <% end %>
                 </div>
                 <h2><%=h @query.name %></h2>
                 <div id="query_form"></div>
                 <% html_title @query.name %>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
             <% end %>
             <% other_formats_links do |f| %>
-            	<%= f.link_to 'Atom', :url => {:query_id => (@query.new_record? ? nil : @query), :key => User.current.rss_key} %>
+            	<%= f.link_to 'Atom', :url => { :project_id => @project, :query_id => (@query.new_record? ? nil : @query), :key => User.current.rss_key } %>
-            	<%= f.link_to 'CSV' %>
+            	<%= f.link_to 'CSV', :url => { :project_id => @project } %>
-            	<%= f.link_to 'PDF' %>
+            	<%= f.link_to 'PDF', :url => { :project_id => @project } %>
             <% end %>
             <% end %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
                 <%= javascript_include_tag 'context_menu' %>
                 <%= stylesheet_link_tag 'context_menu' %>
             <% end %>
             <div id="context-menu" style="display: none;"></div>
             <%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>

test/integration/issues_test.rb +38 -1

             # redMine - project management software
             # Copyright (C) 2006-2008  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require "#{File.dirname(__FILE__)}/../test_helper"
             class IssuesTest < ActionController::IntegrationTest
               fixtures :projects,
                        :users,
                        :roles,
                        :members,
                        :trackers,
                        :projects_trackers,
                        :enabled_modules,
                        :issue_statuses,
                        :issues,
                        :enumerations,
                        :custom_fields,
                        :custom_values,
                        :custom_fields_trackers
               # create an issue
               def test_add_issue
                 log_user('jsmith', 'jsmith')
                 get 'projects/1/issues/new', :tracker_id => '1'
                 assert_response :success
                 assert_template 'issues/new'
                 post 'projects/1/issues', :tracker_id => "1",
                                              :issue => { :start_date => "2006-12-26",
                                                          :priority_id => "3",
                                                          :subject => "new test issue",
                                                          :category_id => "",
                                                          :description => "new issue",
                                                          :done_ratio => "0",
                                                          :due_date => "",
                                                          :assigned_to_id => "" },
                                              :custom_fields => {'2' => 'Value for field 2'}
                 # find created issue
                 issue = Issue.find_by_subject("new test issue")
                 assert_kind_of Issue, issue
                 # check redirection
                 assert_redirected_to :controller => 'issues', :action => 'show', :id => issue
                 follow_redirect!
                 assert_equal issue, assigns(:issue)
                 # check issue attributes
                 assert_equal 'jsmith', issue.author.login
                 assert_equal 1, issue.project.id
                 assert_equal 1, issue.status.id
               end
               # add then remove 2 attachments to an issue
               def test_issue_attachements
                 log_user('jsmith', 'jsmith')
                 set_tmp_attachments_directory
                 post 'issues/1/edit',
                      :notes => 'Some notes',
                      :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
                 assert_redirected_to "issues/1"
                 # make sure attachment was saved
                 attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
                 assert_kind_of Attachment, attachment
                 assert_equal Issue.find(1), attachment.container
                 assert_equal 'This is an attachment', attachment.description
                 # verify the size of the attachment stored in db
                 #assert_equal file_data_1.length, attachment.filesize
                 # verify that the attachment was written to disk
                 assert File.exist?(attachment.diskfile)
                 # remove the attachments
                 Issue.find(1).attachments.each(&:destroy)
                 assert_equal 0, Issue.find(1).attachments.length
               end
+              def test_other_formats_links_on_get_index
+                get '/projects/ecookbook/issues'
+                %w(Atom PDF CSV).each do |format|
+                  assert_tag :a, :content => format,
+                                 :attributes => { :href => "/projects/ecookbook/issues.#{format.downcase}",
+                                                  :rel => 'nofollow' }
+                end
+              end
+              def test_other_formats_links_on_post_index_without_project_id_in_url
+                post '/issues', :project_id => 'ecookbook'
+                %w(Atom PDF CSV).each do |format|
+                  assert_tag :a, :content => format,
+                                 :attributes => { :href => "/projects/ecookbook/issues.#{format.downcase}",
+                                                  :rel => 'nofollow' }
+                end
+              end
+              def test_pagination_links_on_get_index
+                Setting.per_page_options = '2'
+                get '/projects/ecookbook/issues'
+                assert_tag :a, :content => '2',
+                               :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+              end
+              def test_pagination_links_on_post_index_without_project_id_in_url
+                Setting.per_page_options = '2'
+                post '/issues', :project_id => 'ecookbook'
+                assert_tag :a, :content => '2',
+                               :attributes => { :href => '/projects/ecookbook/issues?page=2' }
+              end
             end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages