make_scm_optionnal_even_with_autocreate.patch
| app/views/scm/_project.rhtml (copie de travail) | ||
|---|---|---|
| 1 | 1 |
<% if @project.new_record? && ScmConfig['auto_create'] %> |
| 2 |
<% if ScmConfig['svn'] && ScmConfig['git'] %> |
|
| 2 |
<% if ScmConfig['svn'] || ScmConfig['git'] %> |
|
| 3 |
<% |
|
| 4 |
scm_select_options = [nil] |
|
| 5 |
if ScmConfig['svn'] |
|
| 6 |
scm_select_options << [ 'Subversion' ] |
|
| 7 |
end |
|
| 8 |
if ScmConfig['git'] |
|
| 9 |
scm_select_options << [ 'Git' ] |
|
| 10 |
end |
|
| 11 |
%> |
|
| 3 | 12 |
<p> |
| 4 |
<label for="project_scm"><%= l(:field_scm) %> <span class="required">*</span></label>
|
|
| 5 |
<%= select_tag('project[scm]', options_for_select([ [ 'Subversion' ], [ 'Git' ] ], params[:project] ? params[:project][:scm] : nil)) %><br />
|
|
| 13 |
<label for="project_scm"><%= l(:field_scm) %></label> |
|
| 14 |
<%= select_tag('project[scm]', options_for_select(scm_select_options, params[:project] ? params[:project][:scm] : nil)) %><br />
|
|
| 6 | 15 |
<em><%= l(:text_cannot_be_changed_later) %></em> |
| 7 | 16 |
</p> |
| 8 |
<% elsif ScmConfig['svn'] %> |
|
| 9 |
<%= hidden_field_tag('project[scm]', 'Subversion') %>
|
|
| 10 |
<% else %> |
|
| 11 |
<%= hidden_field_tag('project[scm]', 'Git') %>
|
|
| 12 | 17 |
<% end %> |
| 13 | 18 |
<% end %> |
| lib/scm_project_patch.rb (copie de travail) | ||
|---|---|---|
| 10 | 10 | |
| 11 | 11 |
safe_attributes 'scm' |
| 12 | 12 | |
| 13 |
validates_presence_of :scm, :if => Proc.new { ScmConfig['auto_create'] }
|
|
| 14 | ||
| 15 | 13 |
after_create :create_scm |
| 16 | 14 | |
| 17 | 15 |
def scm=(type) |