meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Previous/Next navigation on a issue is not displayed on r15639 and later (#23781).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15850 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-10-01 08:13:40 +00:00
parent 1673a9540b
commit 7daa5b750f
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/helpers/queries_helper.rb
View File

@ -262,16 +262,19 @@ module QueriesHelper
end end
end end
def retrieve_query_from_session def retrieve_query_from_session(klass=IssueQuery)
if session[:query] session_key = klass.name.underscore.to_sym
if session[:query][:id] session_data = session[session_key]
@query = IssueQuery.find_by_id(session[:query][:id])
if session_data
if session_data[:id]
@query = IssueQuery.find_by_id(session_data[:id])
return unless @query return unless @query
else else
@query = IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names], :totalable_names => session[:query][:totalable_names]) @query = IssueQuery.new(:name => "_", :filters => session_data[:filters], :group_by => session_data[:group_by], :column_names => session_data[:column_names], :totalable_names => session_data[:totalable_names])
end end
if session[:query].has_key?(:project_id) if session_data.has_key?(:project_id)
@query.project_id = session[:query][:project_id] @query.project_id = session_data[:project_id]
else else
@query.project = @project @query.project = @project
end end

29
test/integration/issues_test.rb
View File

@ -109,6 +109,35 @@ class IssuesTest < Redmine::IntegrationTest
assert_equal 0, Issue.find(1).attachments.length assert_equal 0, Issue.find(1).attachments.length
end end
def test_next_and_previous_links_should_be_displayed_after_filter
with_settings :default_language => 'en' do
get '/projects/ecookbook/issues?set_filter=1&tracker_id=1'
assert_response :success
assert_select 'td.id', :text => '5'
get '/issues/5'
assert_response :success
assert_select '.next-prev-links .position', :text => '3 of 5'
end
end
def test_next_and_previous_links_should_be_displayed_after_saved_query
query = IssueQuery.create!(:name => 'Calendar Query',
:visibility => IssueQuery::VISIBILITY_PUBLIC,
:filters => {'tracker_id' => {:operator => '=', :values => ['1']}}
)
with_settings :default_language => 'en' do
get "/projects/ecookbook/issues?set_filter=1&query_id=#{query.id}"
assert_response :success
assert_select 'td.id', :text => '5'
get '/issues/5'
assert_response :success
assert_select '.next-prev-links .position', :text => '6 of 8'
end
end
def test_other_formats_links_on_index def test_other_formats_links_on_index
get '/projects/ecookbook/issues' get '/projects/ecookbook/issues'