From 1c45afac8932bac32838d1e519b5b7971c62fa9f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 2 Nov 2015 19:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=BE=E6=8E=A5=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb                   |  5 +++++
 app/views/projects/_development_group.html.erb      |  2 +-
 .../projects/settings/_new_repositories.html.erb    | 10 +++++++++-
 lib/tasks/update_rep_if_fault.rake                  | 13 +++++++------
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 01b126c26..b6c4ec91b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -615,6 +615,11 @@ module ApplicationHelper
     return rep.blank? ? true :false
   end
 
+  # 获取单一gitlab项目
+  def gitlab_repository(project)
+    rep = Repository.where("project_id =? and type =?", project.id,"Repository::Gitlab" ).first
+  end
+
   # 判断当前用户是否为项目管理员
   def is_project_manager?(user_id, project_id)
     @result = false
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index 67867ffbf..1f4fabde5 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -44,7 +44,7 @@
     <% if rep_is_gitlab?(@project) %>
         <%= link_to l(:project_module_repository), {:controller => 'projects', :action => 'settings', :id => @project.id, :tab=>'repositories'},  :class => "f14 c_blue02" %>
     <% else %>
-        <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id },  :class => "f14 c_blue02" %>
+        <%= link_to l(:project_module_repository),({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).identifier}), :class => "f14 c_blue02" %>
     <% end %>
     <a class="subnav_num">(<%= @project.repositories.count %>)</a>
     <% if (User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) && rep_is_gitlab?(@project) %>
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index e614dc5fe..a62bbc42f 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -7,8 +7,16 @@
 <%= str = error_messages_for 'repository' %>
 <% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
 <% ip = RepositoriesHelper::REPO_IP_ADDRESS %><!--Added by tanxianbo For formatting project's path-->
+<%# 提示 %>
+<% if @project.repositories.count>1 %>
+    <div class="flash notice">
+      项目管理员您好！近日平台完成了版本库升级，以后每个项目将唯一的对应一个版本库。请您按照以下步骤完成项目版本库的更新：
+      <p>1. 点击下面的"创建版本库按钮"，为本项目创建一个新的版本库；</p>
+      <p>2. 从本项目的历史版本库中选择一个您将使用的版本库，将其完整的克隆(clone)到本地，然后推送(push)到新建的版本库(注意不能仅推送代码，否则之前各开发者的提交记录将丢失)。</p>
+      <p>3. 本项目的历史版本库将在您新建版本库的一周内自动隐藏，如果您以后需要这些版本库，请与网站联系，我们将为您提供这些版本库的所有数据。</p>
+    </div>
+<% end %>
 <%# 新建版本库 %>
-
 <% if @project.repositories.count == 0 || rep_is_gitlab?(@project) %>
     <div style="padding-bottom: 40px">
       <a href="javascript:viod(0)" class="pic_add fl mr5" onclick="pro_st_show_ku();"></a>
diff --git a/lib/tasks/update_rep_if_fault.rake b/lib/tasks/update_rep_if_fault.rake
index 7bcf63c4c..1c1f5a36e 100644
--- a/lib/tasks/update_rep_if_fault.rake
+++ b/lib/tasks/update_rep_if_fault.rake
@@ -7,16 +7,17 @@ namespace :rep_fault do
       if project.repositories.count > 0
         unless Repository.where("project_id =? and type = ?",project, "Repository::Gitlab").blank?
           project.repositories.each do |repository|
-            repository.update_attributes(:is_default => false)
+            repository.is_default =1
+            repository.save
           end
         end
       end
     end
   end
 
-  desc "update ossean's data"
-  task :update_type => :environment do
-    repository = Repository.find(400)
-    repository.update_attributes(:type => "Repository::Git")
-  end
+  # desc "update ossean's data"
+  # task :update_type => :environment do
+  #   repository = Repository.find(400)
+  #   repository.update_attributes(:type => "Repository::Git")
+  # end
 end
\ No newline at end of file