Correctly save the subprojects setting when editing queries #1188
This commit is contained in:
parent
8e417fd5c4
commit
335da86b55
|
@ -43,6 +43,7 @@ class QueriesController < ApplicationController
|
||||||
@query.add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v]) if params[:fields] || params[:f]
|
@query.add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v]) if params[:fields] || params[:f]
|
||||||
@query.attributes = params[:query]
|
@query.attributes = params[:query]
|
||||||
@query.project = nil if params[:query_is_for_all]
|
@query.project = nil if params[:query_is_for_all]
|
||||||
|
@query.display_subprojects = params[:display_subprojects] if params[:display_subprojects].present?
|
||||||
@query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
|
@query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
|
||||||
@query.group_by ||= params[:group_by]
|
@query.group_by ||= params[:group_by]
|
||||||
@query.column_names = params[:c] if params[:c]
|
@query.column_names = params[:c] if params[:c]
|
||||||
|
|
|
@ -187,6 +187,25 @@ class QueriesControllerTest < ActionController::TestCase
|
||||||
assert q.valid?
|
assert q.valid?
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_edit_query_with_subprojects
|
||||||
|
q = Query.find(3)
|
||||||
|
q.display_subprojects = false
|
||||||
|
q.save
|
||||||
|
|
||||||
|
@request.session[:user_id] = 1
|
||||||
|
post :edit,
|
||||||
|
:id => 3,
|
||||||
|
:confirm => '1',
|
||||||
|
:default_columns => '1',
|
||||||
|
:fields => ['tracker_id'],
|
||||||
|
:operators => {'tracker_id' => '='},
|
||||||
|
:values => {'tracker_id' => ['3']},
|
||||||
|
:display_subprojects => '1'
|
||||||
|
|
||||||
|
q.reload
|
||||||
|
assert q.display_subprojects?
|
||||||
|
end
|
||||||
|
|
||||||
def test_get_edit_project_private_query
|
def test_get_edit_project_private_query
|
||||||
@request.session[:user_id] = 3
|
@request.session[:user_id] = 3
|
||||||
get :edit, :id => 2
|
get :edit, :id => 2
|
||||||
|
|
Loading…
Reference in New Issue