From 75aca1bad40ee30f54697167848e3a9f83a601b2 Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Mon, 12 Aug 2013 23:43:26 +0800 Subject: [PATCH] 123 --- app/helpers/application_helper.rb | 2 +- app/views/repositories/_form.html.erb | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 87d89eb35..0abe614d0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1012,7 +1012,7 @@ module ApplicationHelper ###xianbo end ###by xianbo - unless pramas[:repository].nil? + unless params[:repository].nil? if params[:repository][:upassword]=="" html << "
-<%= label_tag('repository_scm', l(:label_scm)) %><%= scm_select_tag(@repository) %> -<% if @repository && ! @repository.class.scm_available %> - <%= l(:text_scm_command_not_available) %> -<% end %> +<%= label_tag('repository_scm', l(:label_scm)) %> + +<%= select_tag('repository_scm', + options_for_select(["Subversion"],@repository.class.name.demodulize), + :data => {:remote => true, :method => 'get'})%> +
<%= f.check_box :is_default, :label => :field_repository_is_default %>
@@ -14,14 +16,17 @@ <%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_repository_identifier_info).html_safe %> <% end %> -<% button_disabled = true %> -<% if @repository %> -<% button_disabled = ! @repository.class.scm_available %> -<%= repository_field_tags(f, @repository)%> -<% end %> + +<%= f.text_field :url, :size => 60, :required => true, :disabled => !@repository.safe_attribute?('url') %> + <%= "定义已有版本库URL路径,定义格式file:///, http://, https://, svn://, svn+[tunnelscheme]://" %> +
+<%= f.text_field :login, :size => 30 %>
+<%= 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]';" %>
- <%= 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') %>