diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/apis/sys_api.rb | 33 | ||||
| -rw-r--r-- | app/controllers/sys_controller.rb | 50 |
2 files changed, 27 insertions, 56 deletions
diff --git a/app/apis/sys_api.rb b/app/apis/sys_api.rb deleted file mode 100644 index fcee616b5..000000000 --- a/app/apis/sys_api.rb +++ /dev/null @@ -1,33 +0,0 @@ -# redMine - project management software -# Copyright (C) 2006-2007 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 AWSProjectWithRepository < ActionWebService::Struct - member :id, :int - member :identifier, :string - member :name, :string - member :is_public, :bool - member :repository, Repository -end - -class SysApi < ActionWebService::API::Base - api_method :projects_with_repository_enabled, - :expects => [], - :returns => [[AWSProjectWithRepository]] - api_method :repository_created, - :expects => [:string, :string, :string], - :returns => [:int] -end diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb index 8aff3bd15..da4b119a7 100644 --- a/app/controllers/sys_controller.rb +++ b/app/controllers/sys_controller.rb @@ -1,5 +1,5 @@ -# redMine - project management software -# Copyright (C) 2006-2007 Jean-Philippe Lang +# Redmine - project management software +# Copyright (C) 2006-2009 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 @@ -16,31 +16,35 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class SysController < ActionController::Base - wsdl_service_name 'Sys' - web_service_api SysApi - web_service_scaffold :invoke + before_filter :check_enabled - before_invocation :check_enabled - - # Returns the projects list, with their repositories - def projects_with_repository_enabled - Project.has_module(:repository).find(:all, :include => :repository, :order => 'identifier') + def projects + p = Project.active.has_module(:repository).find(:all, :include => :repository, :order => 'identifier') + render :xml => p.to_xml(:include => :repository) end - - # Registers a repository for the given project identifier - def repository_created(identifier, vendor, url) - project = Project.find_by_identifier(identifier) - # Do not create the repository if the project has already one - return 0 unless project && project.repository.nil? - logger.debug "Repository for #{project.name} was created" - repository = Repository.factory(vendor, :project => project, :url => url) - repository.save - repository.id || 0 + + def create_project_repository + project = Project.find(params[:id]) + if project.repository + render :nothing => true, :status => 409 + else + logger.info "Repository for #{project.name} was reported to be created by #{request.remote_ip}." + project.repository = Repository.factory(params[:vendor], params[:repository]) + if project.repository && project.repository.save + render :xml => project.repository, :status => 201 + else + render :nothing => true, :status => 422 + end + end end -protected + protected - def check_enabled(name, args) - Setting.sys_api_enabled? + def check_enabled + User.current = nil + unless Setting.sys_api_enabled? + render :nothing => 'Access denied. Repository management WS is disabled.', :status => 403 + return false + end end end |