jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

123

This commit is contained in:
fanqiang 2013-08-12 23:43:26 +08:00
parent 299d02ebe8
commit 75aca1bad4
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -1012,7 +1012,7 @@ module ApplicationHelper
###xianbo ###xianbo
end end
###by xianbo ###by xianbo
unless pramas[:repository].nil? unless params[:repository].nil?
if params[:repository][:upassword]=="" if params[:repository][:upassword]==""
html << "<li>"+ l(:label_password_not_null) +"</li>\n" html << "<li>"+ l(:label_password_not_null) +"</li>\n"
end end

27
app/views/repositories/_form.html.erb
View File

@ -2,10 +2,12 @@
<div class="box tabular"> <div class="box tabular">
<p> <p>
<%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %> <%= label_tag('repository_scm', l(:label_scm)) %>
<% if @repository && ! @repository.class.scm_available %> <!--Modified by tanxianbo-->
<em class="info error"><%= l(:text_scm_command_not_available) %></em> <%= select_tag('repository_scm',
<% end %> options_for_select(["Subversion"],@repository.class.name.demodulize),
:data => {:remote => true, :method => 'get'})%>
<!--Ended by tanxianbo-->
</p> </p>
<p><%= f.check_box :is_default, :label => :field_repository_is_default %></p> <p><%= f.check_box :is_default, :label => :field_repository_is_default %></p>
@ -14,14 +16,17 @@
<em class="info"><%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %></em> <em class="info"><%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %></em>
<% end %></p> <% end %></p>
<% button_disabled = true %> <!--Modified by tanxianbo-->
<% if @repository %> <p><%= f.text_field :url, :size => 60, :required => true, :disabled => !@repository.safe_attribute?('url') %>
<% button_disabled = ! @repository.class.scm_available %> <em class='info'><%= "定义已有版本库URL路径，定义格式file:///, http://, https://, svn://, svn+[tunnelscheme]://" %></em>
<%= repository_field_tags(f, @repository)%> </p>
<% end %> <p><%= f.text_field :login, :size => 30 %></p>
<p><%= f.password_field :password, :size => 30, :name => 'ignore', :value => ((@repository.new_record? || @repository.password.blank?) ? '' : ('x'*15)),
:onfocus => "this.value=''; this.name='repository[password]';",
:onchange => "this.name='repository[password]';" %></p>
</div> </div>
<!--Ended by tanxianbo-->
<p> <p>
<%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save), :disabled => button_disabled) %> <%= submit_tag(@repository.new_record? ? l(:button_create) : l(:button_save)) %>
<%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'repositories') %> <%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'repositories') %>
</p> </p>