From f41696eaee8207ee5eb29825acb3ca8a473420e8 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 25 Oct 2016 13:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=8F=8A=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb    | 23 +++++++++++--------
 app/views/layouts/_base_project_top.html.erb  |  2 +-
 .../settings/_new_repositories.html.erb       |  2 +-
 app/views/repositories/show.html.erb          | 14 +++++------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index fe2b7f61f..73be64f0b 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -265,7 +265,7 @@ update
       if request.post? && @repository.save
         s = Trustie::Gitlab::Sync.new
         s.create_project(@project, @repository)
-        redirect_to settings_project_url(@project, :tab => 'repositories')
+        redirect_to(:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).try(:identifier))
       else
         redirect_to settings_project_url(@project, :tab => 'repositories',:repository_error_message=>@repository.errors.full_messages)
       end
@@ -387,19 +387,21 @@ update
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      @changesets_latest_coimmit = @g.commit(@project.gpid, @entries.first.try(:lastrev))
-      # @changesets_latest_coimmit = @g.commits(@project.gpid, :ref_name => @rev)[0]
+      unless @entries.blank?
+        @changesets_latest_coimmit = @g.commit(@project.gpid, @entries.first.try(:lastrev))
+        # 总的提交数
+        @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count
+        # 获取默认分支
+        @g_default_branch = @g_project.default_branch.nil? ?  "master" : @g_project.default_branch
 
-      # 总的提交数
-      @changesets_all_count = @g.user_static(@project.gpid, :rev => @rev).count
-
-      # 获取默认分支
-      @g_default_branch = @g_project.default_branch.nil? ?  "master" : @g_project.default_branch
+        @creator = @project.owner.to_s
+        gitlab_address = Redmine::Configuration['gitlab_address']
+        # REDO:需优化，仅测试用
+        @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
+      end
 
       @creator = @project.owner.to_s
       gitlab_address = Redmine::Configuration['gitlab_address']
-      # REDO:需优化，仅测试用
-      @zip_path = Gitlab.endpoint.to_s + "/projects/" + @project.gpid.to_s + "/repository/archive?&private_token=" + Gitlab.private_token
       @repos_url = gitlab_address.to_s+"/" + @creator + "/" + @repository.identifier+"."+"git"
 
       # 一些数据的异步同步更新
@@ -410,6 +412,7 @@ update
       else
         project_score.update_column(:changeset_num, @changesets_all_count)
       end
+      # 更新提交时间，用于课程
       unless @changesets_latest_coimmit.blank?
         update_commits_date(@project, @changesets_latest_coimmit)
       end
diff --git a/app/views/layouts/_base_project_top.html.erb b/app/views/layouts/_base_project_top.html.erb
index 62e49502a..222998a73 100644
--- a/app/views/layouts/_base_project_top.html.erb
+++ b/app/views/layouts/_base_project_top.html.erb
@@ -44,7 +44,7 @@
       <% end %>
       <!--版本库-->
       <% if visible_repository?(@project) %>
-          <li id="project_menu_05"><%= link_to @project.project_score.changeset_num > 0 ? "#{l(:project_module_repository)}<span class='issues_nav_tag ml5'>#{switch_integer_into_k project_score.changeset_num}</span>".html_safe : "#{l(:project_module_repository)}",({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).try(:identifier)}), :class => "pro_new_proname", :title => "#{project_score.changeset_num}"  %>
+          <li id="project_menu_05"><%= link_to @project.project_score.changeset_num.to_i > 0 ? "#{l(:project_module_repository)}<span class='issues_nav_tag ml5'>#{switch_integer_into_k project_score.changeset_num}</span>".html_safe : "#{l(:project_module_repository)}",({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => gitlab_repository(@project).try(:identifier)}), :class => "pro_new_proname", :title => "#{project_score.changeset_num}"  %>
           </li>
       <% end %>
       <!--Pull Request-->
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 0a6e64750..87c19976b 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -2,7 +2,7 @@
 <% if @gitlab_repository.nil? %>
     <div class=" sy_new_tchbox clear " >
       <a href="javascript:void(0);" class=" sy_btn_green  mb10">新建版本库</a>
-      <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off', :remote => true} do |f| %>
+      <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project), :html => {:id => 'repository-form', :method=>"post", :autocomplete => 'off'} do |f| %>
           <ul class="pro_newsetting_con mb15">
             <li style="display: none">
               <label class="label02"><%=l(:label_scm)%>：</label>
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 779c2a835..90ad0e7f4 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -82,13 +82,13 @@
     <% unless memo.nil? %>
     <a href="<%= Setting.protocol + "://" %><%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
     <% end %>
-
-    <div class="fr">
-      <a style="color: #7f7f7f;">导出统计结果：</a>
-      <%= link_to "最近一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week"  } %> <a style="color: #7f7f7f;">|</a>
-      <%= link_to "最近一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" } %>
-    </div>
-
+    <% unless @entries.blank? %>
+          <div class="fr">
+            <a style="color: #7f7f7f;">导出统计结果：</a>
+            <%= link_to "最近一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week"  } %> <a style="color: #7f7f7f;">|</a>
+            <%= link_to "最近一月", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "month" } %>
+          </div>
+    <% end %>
       <%#= link_to "导出excel", {:controller => 'repositories', :action => 'export_rep_static', :rev => @rev}, :format => 'xls' %>
       <!--<a href="<%#=project_issues_path(:project_id => @project, :format => 'xls')%>" class="hw_btn_blue  fr" alt="导出EXCEL">导出EXCEL</a>-->
     </div>