From a62001c89250fd84c4cb407e7e976979566e2b3a Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 13 May 2015 10:27:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E7=89=88=E6=9C=AC=E5=BA=93--?= =?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E4=B8=BB=E7=89=88=E6=9C=AC=E5=BA=93?= =?UTF-8?q?=E5=B7=B2=E5=AD=98=E5=9C=A8=EF=BC=8C=E6=96=B0=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E5=85=81=E8=AE=B8=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E4=B8=BB=E7=89=88=E6=9C=AC=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/repositories_helper.rb | 12 ++++++++++++ .../projects/settings/_new_repositories.html.erb | 10 ++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 773560932..9ee11e392 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -232,6 +232,18 @@ module RepositoriesHelper :label => l(:label_git_report_last_commit) )) end + + # 判断项目是否有主版本库 + def judge_main_repository(pro) + if pro.repositories.blank? + return false + else + pro.repositories.sort.each do |rep| + rep.is_default? + return true + end + end + end # def cvs_field_tags(form, repository) # content_tag('p', form.text_field( # :root_url, diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index e6a0ac296..ef70f1e60 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -72,10 +72,12 @@ <%= l(:text_scm_command_not_available) %> <% end %> -
  • - - <%= f.check_box :is_default, :label => "" %>

    -
  • + <% unless judge_main_repository(@project) %> +
  • + + <%= f.check_box :is_default, :label => "" %>

    +
  • + <% end %>
  • <%= f.text_field :identifier, :disabled =>@repository.nil? || @repository.identifier_frozen? ? true:false,:label=>""%>