Mercurial > hg > soundsoftware-site
diff app/controllers/sys_controller.rb @ 909:cbb26bc654de redmine-1.3
Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)
author | Chris Cannam |
---|---|
date | Fri, 24 Feb 2012 19:09:32 +0000 |
parents | 513646585e45 |
children | 5e80956cc792 433d4f72a19b |
line wrap: on
line diff
--- a/app/controllers/sys_controller.rb Fri Feb 24 18:36:29 2012 +0000 +++ b/app/controllers/sys_controller.rb Fri Feb 24 19:09:32 2012 +0000 @@ -1,28 +1,29 @@ # Redmine - project management software -# Copyright (C) 2006-2009 Jean-Philippe Lang +# Copyright (C) 2006-2011 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 SysController < ActionController::Base before_filter :check_enabled - + def projects p = Project.active.has_module(:repository).find(:all, :include => :repository, :order => 'identifier') - render :xml => p.to_xml(:include => :repository) + # extra_info attribute from repository breaks activeresource client + render :xml => p.to_xml(:only => [:id, :identifier, :name, :is_public, :status], :include => {:repository => {:only => [:id, :url]}}) end - + def create_project_repository project = Project.find(params[:id]) if project.repository @@ -31,13 +32,13 @@ 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 + render :xml => project.repository.to_xml(:only => [:id, :url]), :status => 201 else render :nothing => true, :status => 422 end end end - + def fetch_changesets projects = [] if params[:id]