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 @@
<% 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") %> -
<%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
-
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>:
-
<%= @changesets_latest_coimmit.message %>
-
+ <% 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") %> +
<%=link_to user_commit_rep(@changesets_latest_coimmit.author_email), user_path(user_commit_rep(@changesets_latest_coimmit.author_email)) %>
+
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>:
+
<%= @changesets_latest_coimmit.message %>
+
+ <% else %> +
<%=@changesets_latest_coimmit.author_email %>
+
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>:
+
<%= @changesets_latest_coimmit.message %>
+
+ <%end%> <% end %> <%= @repository.branches.count %> 个分支 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 {