680f437715
When a restricted visibility level of `private` is set in the instance, creating a snippet with the `visibility` level would always fail. This happened because: 1. `params[:visibility]` was a string (e.g. "public") 2. `CreateSnippetService` and `UpdateSnippetService` only looked at `params[:visibility_level]`, which was `nil`. To fix this, we: 1. Make `CreateSnippetService` look at the newly-built `snippet.visibility_level`, since the right value is assigned by the `VisibilityLevel#visibility=` method. 2. Modify `UpdateSnippetService` to handle both `visibility_level` and `visibility` parameters. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/66050
67 lines
1.4 KiB
Ruby
67 lines
1.4 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class BaseService
|
|
include Gitlab::Allowable
|
|
|
|
attr_accessor :project, :current_user, :params
|
|
|
|
def initialize(project, user = nil, params = {})
|
|
@project, @current_user, @params = project, user, params.dup
|
|
end
|
|
|
|
def notification_service
|
|
NotificationService.new
|
|
end
|
|
|
|
def event_service
|
|
EventCreateService.new
|
|
end
|
|
|
|
def todo_service
|
|
TodoService.new
|
|
end
|
|
|
|
def log_info(message)
|
|
Gitlab::AppLogger.info message
|
|
end
|
|
|
|
def log_error(message)
|
|
Gitlab::AppLogger.error message
|
|
end
|
|
|
|
def system_hook_service
|
|
SystemHooksService.new
|
|
end
|
|
|
|
delegate :repository, to: :project
|
|
|
|
# Add an error to the specified model for restricted visibility levels
|
|
def deny_visibility_level(model, denied_visibility_level = nil)
|
|
denied_visibility_level ||= model.visibility_level
|
|
|
|
level_name = Gitlab::VisibilityLevel.level_name(denied_visibility_level).downcase
|
|
|
|
model.errors.add(:visibility_level, "#{level_name} has been restricted by your GitLab administrator")
|
|
end
|
|
|
|
def visibility_level
|
|
params[:visibility].is_a?(String) ? Gitlab::VisibilityLevel.level_value(params[:visibility]) : params[:visibility_level]
|
|
end
|
|
|
|
private
|
|
|
|
def error(message, http_status = nil)
|
|
result = {
|
|
message: message,
|
|
status: :error
|
|
}
|
|
|
|
result[:http_status] = http_status if http_status
|
|
result
|
|
end
|
|
|
|
def success(pass_back = {})
|
|
pass_back[:status] = :success
|
|
pass_back
|
|
end
|
|
end
|