0007-display-creation-button-below-form.patch
app/views/repositories/_form.html.erb | ||
---|---|---|
18 | 18 | |
19 | 19 |
<% button_disabled = true %> |
20 | 20 |
<% if @repository %> |
21 |
<% button_disabled = ! @repository.class.scm_available || ( !ScmConfig['allow_add_local'] && @repository.new_record?) %> |
|
22 |
<%= repository_field_tags(f, @repository)%> |
|
21 |
<%= repository_field_tags(f, @repository)%> |
|
22 |
<% button_enabled = @repository.class.scm_available && ((ScmConfig['allow_add_local'] && @repository.new_record?) || !@create_enabled || ! @repository.new_record?) %> |
|
23 |
<% button_disabled = ! button_enabled %> |
|
24 |
<% create_button_enabled = @create_enabled && @repository.new_record? && @repository.class.scm_available %> |
|
23 | 25 |
<% end %> |
24 | 26 |
</div> |
25 | 27 | |
28 | ||
26 | 29 |
<p> |
27 |
<% unless button_disabled %> |
|
28 |
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save), :id => 'repository_save', :disabled => button_disabled) %> |
|
29 |
<% end %> |
|
30 |
<% unless button_disabled %> |
|
31 |
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save), :id => 'repository_save', :disabled => button_disabled, |
|
32 |
:title => @repository.new_record? ? "Add existing repository" : "Save Settings" ) %> |
|
33 |
<% end %> |
|
34 |
<% if create_button_enabled %> |
|
35 |
<% if defined? observe_field %> |
|
36 |
<%= submit_tag(l(:button_create_new_repository), :onclick => "$('repository_operation').value = 'add';", :title => "Create and add new repository") %> |
|
37 |
<% else %> |
|
38 |
<%= submit_tag(l(:button_create_new_repository), :onclick => "$('#repository_operation').val('add');", :title => "Create and add new repository" ) %> |
|
39 |
<%end%> |
|
40 |
<% end %> |
|
30 | 41 |
<%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'repositories') %> |
31 | 42 |
</p> |
lib/scm_repositories_helper_patch.rb | ||
---|---|---|
68 | 68 |
svntags = subversion_field_tags_reduced(form,repository) |
69 | 69 |
svntags.gsub!('<br />', '<br />') |
70 | 70 | |
71 |
@create_enabled = SubversionCreator.enabled? |
|
72 | ||
71 | 73 |
if @project.respond_to?(:repositories) && |
72 | 74 |
ScmConfig['max_repos'] && ScmConfig['max_repos'].to_i > 0 && @project.repositories.select{ |r| r.created_with_scm }.size >= ScmConfig['max_repos'].to_i |
73 | 75 |
return svntags |
... | ... | |
111 | 113 |
def mercurial_field_tags_with_add(form, repository) |
112 | 114 |
hgtags = mercurial_field_tags_without_add(form, repository) |
113 | 115 | |
116 |
@create_enabled = MercurialCreator.enabled? |
|
117 | ||
114 | 118 |
if @project.respond_to?(:repositories) && |
115 | 119 |
ScmConfig['max_repos'] && ScmConfig['max_repos'].to_i > 0 && @project.repositories.select{ |r| r.created_with_scm }.size >= ScmConfig['max_repos'].to_i |
116 | 120 |
return hgtags |
... | ... | |
156 | 160 |
def bazaar_field_tags_with_add(form, repository) |
157 | 161 |
bzrtags = bazaar_field_tags_without_add(form, repository) |
158 | 162 | |
163 |
@create_enabled = BazaarCreator.enabled? |
|
164 | ||
159 | 165 |
if @project.respond_to?(:repositories) && |
160 | 166 |
ScmConfig['max_repos'] && ScmConfig['max_repos'].to_i > 0 && @project.repositories.select{ |r| r.created_with_scm }.size >= ScmConfig['max_repos'].to_i |
161 | 167 |
return bzrtags |
... | ... | |
207 | 213 |
return gittags |
208 | 214 |
end |
209 | 215 | |
216 |
@create_enabled = GitCreator.enabled? |
|
217 | ||
210 | 218 |
if repository.new_record? && GitCreator.enabled? |
211 | 219 |
if defined? observe_field # Rails 3.0 and below |
212 | 220 |
add = submit_tag(l(:button_create_new_repository), :onclick => "$('repository_operation').value = 'add';") |
213 |
- |