| @@ -94,7 +94,12 module QueriesHelper | |||||
| 94 |
|
94 | |||
| 95 | def retrieve_query_from_session |
|
95 | def retrieve_query_from_session | |
| 96 | if session[:query] |
|
96 | if session[:query] | |
| 97 | @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names]) |
|
97 | if session[:query][:id] | |
|
|
98 | @query = Query.find_by_id(session[:query][:id]) | |||
|
|
99 | return unless @query | |||
|
|
100 | else | |||
|
|
101 | @query = Query.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names]) | |||
|
|
102 | end | |||
| 98 | if session[:query].has_key?(:project_id) |
|
103 | if session[:query].has_key?(:project_id) | |
| 99 | @query.project_id = session[:query][:project_id] |
|
104 | @query.project_id = session[:query][:project_id] | |
| 100 | else |
|
105 | else | |
| @@ -947,6 +947,24 class IssuesControllerTest < ActionController::TestCase | |||||
| 947 | assert_tag 'a', :attributes => {:href => '/issues/5'}, :content => /Next/ |
|
947 | assert_tag 'a', :attributes => {:href => '/issues/5'}, :content => /Next/ | |
| 948 | end |
|
948 | end | |
| 949 |
|
949 | |||
|
|
950 | def test_show_should_display_prev_next_links_with_saved_query_in_session | |||
|
|
951 | query = Query.create!(:name => 'test', :is_public => true, :user_id => 1, | |||
|
|
952 | :filters => {'status_id' => {:values => ['5'], :operator => '='}}, | |||
|
|
953 | :sort_criteria => [['id', 'asc']]) | |||
|
|
954 | @request.session[:query] = {:id => query.id, :project_id => nil} | |||
|
|
955 | ||||
|
|
956 | get :show, :id => 11 | |||
|
|
957 | ||||
|
|
958 | assert_response :success | |||
|
|
959 | assert_equal query, assigns(:query) | |||
|
|
960 | # Previous and next issues for all projects | |||
|
|
961 | assert_equal 8, assigns(:prev_issue_id) | |||
|
|
962 | assert_equal 12, assigns(:next_issue_id) | |||
|
|
963 | ||||
|
|
964 | assert_tag 'a', :attributes => {:href => '/issues/8'}, :content => /Previous/ | |||
|
|
965 | assert_tag 'a', :attributes => {:href => '/issues/12'}, :content => /Next/ | |||
|
|
966 | end | |||
|
|
967 | ||||
| 950 | def test_show_should_display_prev_next_links_with_query_and_sort_on_association |
|
968 | def test_show_should_display_prev_next_links_with_query_and_sort_on_association | |
| 951 | @request.session[:query] = {:filters => {'status_id' => {:values => [''], :operator => 'o'}}, :project_id => nil} |
|
969 | @request.session[:query] = {:filters => {'status_id' => {:values => [''], :operator => 'o'}}, :project_id => nil} | |
| 952 |
|
970 | |||
General Comments 0
You need to be logged in to leave comments.
Login now