Skip to content

Limit @query modifications to IssueQuery instances #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Limit @query modifications to IssueQuery instances #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions lib/query_share/patches/queries_controller_patch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@ module ClassMethods
module InstanceMethods
def update_query_from_params_with_share
update_query_from_params_without_share
share_visibility = params[:query] && params[:query][:visibility]
if @query.instanceof?(IssueQuery)
share_visibility = params[:query] && params[:query][:visibility]

if (User.current.allowed_to?(:manage_group_queries, @query.project) || User.current.admin?) &&
share_visibility.to_i == IssueQuery::VISIBILITY_GROUP
@query.query_principal_ids = params[:query] && params[:query][:principal_ids]
@query.principals_logins = params[:query] && params[:query][:principals_logins]
@query.visibility = share_visibility
elsif @query.visibility.to_i == IssueQuery::VISIBILITY_GROUP
@query.visibility = IssueQuery::VISIBILITY_PRIVATE
if (User.current.allowed_to?(:manage_group_queries, @query.project) || User.current.admin?) &&
share_visibility.to_i == IssueQuery::VISIBILITY_GROUP
@query.query_principal_ids = params[:query] && params[:query][:principal_ids]
@query.principals_logins = params[:query] && params[:query][:principals_logins]
@query.visibility = share_visibility
elsif @query.visibility.to_i == IssueQuery::VISIBILITY_GROUP
@query.visibility = IssueQuery::VISIBILITY_PRIVATE
end
end

@query
end
end
Expand Down