From 1115d54d9a55cd7065686f687a686cb1304054ab Mon Sep 17 00:00:00 2001
From: "Gan Yi.ang" <ganyiang@outlook.com>
Date: Fri, 27 Nov 2015 11:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=9Etrustie=E7=94=A8=E6=88=B7changesets=5F?=
 =?UTF-8?q?latest=5Fcoimmit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb   |  2 +-
 app/views/repositories/show.html.erb | 17 ++++++++++++-----
 public/stylesheets/repository.css    |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index ddabb5356..ff4aa61fb 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -61,7 +61,7 @@ module RepositoriesHelper
 
   def user_commit_rep(mail)
     user = User.find_by_mail(mail)
-    user.nil? ? User.find(2) :  User.find_by_mail(mail)
+    #user.nil? ? User.find(2) :  User.find_by_mail(mail)
   end
 
   def render_properties(properties)
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 7aac3af1d..0a95851d0 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -29,11 +29,18 @@
       <div class="cl"></div>
       <div class="recordBanner mt10">
         <% if @changesets && !@changesets.empty? %>
-            <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
-            <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
-                <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
-                <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
-            </span>
+            <% if !user_commit_rep(@changesets_latest_coimmit.author_email).nil? %>
+                <%= image_tag(url_to_avatar(user_commit_rep(@changesets_latest_coimmit.author_email)),  :width => "25", :height => "25", :class => "fl portraitRadius mt2 ml4 mr5") %>
+                <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %></div>
+                    <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
+                    <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
+                </span>
+            <% else %>
+                 <span class="fl"><div class="fb fontGrey3 mr5 fl"><%=@changesets_latest_coimmit.author_email %></div>
+                    <div class="fl">提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：</div>
+                    <div class="commit_content_dec fl" title="<%= @changesets_latest_coimmit.comments %>"><%= @changesets_latest_coimmit.message %></div>
+                </span>
+            <%end%>
         <% end %>
         <span class="fr mr5 "><font class="fb ml2 mr2 vl_branch mt2">
             <%= @repository.branches.count %></font> 个分支
diff --git a/public/stylesheets/repository.css b/public/stylesheets/repository.css
index 27941cb9e..2e084d61c 100644
--- a/public/stylesheets/repository.css
+++ b/public/stylesheets/repository.css
@@ -220,7 +220,7 @@
 .vl_branch {background:url(../images/vlicon/branch_icon.png) 0px -2px no-repeat; padding-left:22px}
 .mt1 {margin-top:1px;}
 .mt2 {margin-top:2px;}
-.commit_content_dec{width: 300px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
+.commit_content_dec{width: 200px;overflow: hidden; white-space: nowrap;text-overflow: ellipsis;}
 
 /*提交信息列表*/
 .col-md-10 {