allow for global permission check in non project context

8 years ago · ebb519b9dc
parent 635c6cdec6
commit ebb519b9dc
2 changed files with 4 additions and 4 deletions
--- a/lib/api/v3/queries/create_form_representer.rb
+++ b/lib/api/v3/queries/create_form_representer.rb
@ -58,8 +58,8 @@ module API

        def allow_commit?
          represented.name.present? && (
-              (!represented.is_public && current_user.allowed_to?(:save_queries, represented.project)) ||
-              (represented.is_public && current_user.allowed_to?(:manage_public_queries, represented.project))
+              (!represented.is_public && current_user.allowed_to?(:save_queries, represented.project, global: represented.project.nil?)) ||
+              (represented.is_public && current_user.allowed_to?(:manage_public_queries, represented.project, global: represented.project.nil?))
            ) && @errors.empty?
        end
      end
--- a/lib/api/v3/queries/update_form_representer.rb
+++ b/lib/api/v3/queries/update_form_representer.rb
@ -58,8 +58,8 @@ module API

        def allow_commit?
          represented.name.present? && (
-              (!represented.is_public && current_user.allowed_to?(:save_queries, represented.project)) ||
-              (represented.is_public && current_user.allowed_to?(:manage_public_queries, represented.project))
+              (!represented.is_public && current_user.allowed_to?(:save_queries, represented.project, global: represented.project.nil?)) ||
+              (represented.is_public && current_user.allowed_to?(:manage_public_queries, represented.project, global: represented.project.nil?))
            ) && @errors.empty?
        end
      end