mirror of
https://github.com/redmine/redmine.git
synced 2025-10-27 00:06:15 +01:00
Reverts r23835 due to wrong issue ID (#40856).
git-svn-id: https://svn.redmine.org/redmine/trunk@23836 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
#
|
||||
# Redmine - project management software
|
||||
# Copyright (C) 2006- Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
class Oauth2ApplicationsController < Doorkeeper::ApplicationsController
|
||||
private
|
||||
|
||||
def application_params
|
||||
params[:doorkeeper_application] ||= {}
|
||||
params[:doorkeeper_application][:scopes] ||= []
|
||||
|
||||
scopes = Redmine::AccessControl.public_permissions.map{|p| p.name.to_s}
|
||||
|
||||
if params[:doorkeeper_application][:scopes].is_a?(Array)
|
||||
scopes |= params[:doorkeeper_application][:scopes]
|
||||
else
|
||||
scopes |= params[:doorkeeper_application][:scopes].split(/\s+/)
|
||||
end
|
||||
params[:doorkeeper_application][:scopes] = scopes.join(' ')
|
||||
super
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user