def retrieve_query_from_session
if session[:query]
- @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
+ if session[:query][:id]
+ @query = Query.find_by_id(session[:query][:id])
+ return unless @query
+ else
+ @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
+ end
if session[:query].has_key?(:project_id)
@query.project_id = session[:query][:project_id]
else
assert_tag 'a', :attributes => {:href => '/issues/5'}, :content => /Next/
end
+ def test_show_should_display_prev_next_links_with_saved_query_in_session
+ query = Query.create!(:name => 'test', :is_public => true, :user_id => 1,
+ :filters => {'status_id' => {:values => ['5'], :operator => '='}},
+ :sort_criteria => [['id', 'asc']])
+ @request.session[:query] = {:id => query.id, :project_id => nil}
+
+ get :show, :id => 11
+
+ assert_response :success
+ assert_equal query, assigns(:query)
+ # Previous and next issues for all projects
+ assert_equal 8, assigns(:prev_issue_id)
+ assert_equal 12, assigns(:next_issue_id)
+
+ assert_tag 'a', :attributes => {:href => '/issues/8'}, :content => /Previous/
+ assert_tag 'a', :attributes => {:href => '/issues/12'}, :content => /Next/
+ end
+
def test_show_should_display_prev_next_links_with_query_and_sort_on_association
@request.session[:query] = {:filters => {'status_id' => {:values => [''], :operator => 'o'}}, :project_id => nil}