comparison app/controllers/repositories_controller.rb @ 310:b9c2ba9e49b4 live

Merge from branch "feature_73"
author Chris Cannam
date Mon, 28 Mar 2011 17:50:25 +0100
parents 4d493e74dcfc
children 350acce374a2
comparison
equal deleted inserted replaced
289:2de308601155 310:b9c2ba9e49b4
34 34
35 rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed 35 rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
36 36
37 def edit 37 def edit
38 @repository = @project.repository 38 @repository = @project.repository
39
39 if !@repository 40 if !@repository
41
42 params[:repository_scm]='Mercurial'
43
40 @repository = Repository.factory(params[:repository_scm]) 44 @repository = Repository.factory(params[:repository_scm])
41 @repository.project = @project if @repository 45 @repository.project = @project if @repository
42 end 46 end
43 if request.post? && @repository 47 if request.post? && @repository
44 @repository.attributes = params[:repository] 48 @repository.attributes = params[:repository]
45 @repository.save 49 @repository.save
46 end 50 end
51
47 render(:update) do |page| 52 render(:update) do |page|
48 page.replace_html "tab-content-repository", :partial => 'projects/settings/repository' 53 page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'
49 if @repository && !@project.repository 54 if @repository && !@project.repository
50 @project.reload #needed to reload association 55 @project.reload #needed to reload association
51 page.replace_html "main-menu", render_main_menu(@project) 56 page.replace_html "main-menu", render_main_menu(@project)