项目动态中添加提交动态

app/controllers/projects_controller.rb

@@ -306,7 +306,7 @@ class ProjectsController < ApplicationController
     if User.current.member_of?(@project) || User.current.admin?
       case params[:type]
         when nil
-          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'Project', 'Attachment')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
+          @events_pages = ForgeActivity.where("project_id = ? and forge_act_type in ('Issue', 'Message','News', 'Project', 'Attachment','Commit')", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
         when 'issue'
           @events_pages = ForgeActivity.where("project_id = ? and forge_act_type = 'Issue'", @project).includes(:forge_act).order("updated_at desc").limit(10).offset(@page * 10)
         when 'news'
@@ -320,7 +320,7 @@ class ProjectsController < ApplicationController
       @events_pages = ForgeActivity.includes(:project).where("forge_activities.project_id = ? and projects.is_public = ? and forge_act_type != ? ",@project,1, "Document").order("created_at desc").page(params['page'|| 1]).per(10);
     end
 
-    # g = Gitlab.client
+    # 版本库统计图
     unless @project.gpid.nil? || @project.project_score.changeset_num == 0
       # rep_statics_commit = @project.rep_statics.order("commits_num desc")
       rep_statics_commit = RepStatics.find_by_sql("SELECT * FROM `rep_statics` where project_id = #{@project.id} order by commits_num desc limit 10")

app/helpers/application_helper.rb

@@ -38,6 +38,12 @@ module ApplicationHelper
   #   super
   # end
 
+  # 通过系统外部邮箱查找用户，如果用户不存在则用邮箱替换
+  def get_user_by_mail mail
+    user = User.find_by_mail(mail)
+    user.nil? ? User.find(2) : user
+  end
+
   # 获取用户单位
   # 优先获取高校信息，如果改信息不存在则获取occupation
   def get_occupation_from_user user

app/views/projects/_project_activities.html.erb

@@ -72,23 +72,8 @@
             <!--Attachment   -->
         <% when "Attachment" %>
             <%= render :partial => 'users/project_attachment', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
-            <!--<div class="problem_main">-->
-              <!--<a class="problem_pic fl"><%#= image_tag(url_to_avatar(activity.user), :width => "42", :height => "42") %></a>-->
-
-              <!--<div class="problem_txt fl mt5 break_word">-->
-                <!--<a class="problem_name fl ">-->
-                  <!--<%#= h(e.project) if @project.nil? || @project.id != e.project_id %>-->
-                  <!--<%#= link_to h(activity.user), user_path(activity.user_id), :class => "problem_name c_orange fl" %></a><span class="fl"> <%#= l(:label_new_activity) %>-->
-                <!--：</span>-->
-                <%#= link_to format_activity_title("#{l(:label_attachment)}: #{act.filename}"), {:controller => 'attachments', :action => 'show', :id => act.id}, :class => "problem_tit fl fb" %>
-                <!--<br/>-->
-
-                <!--<p class="mt5 break_word"><#%= textAreailizable act, :description %><br/>-->
-                  <!--<%#= l :label_create_time %>-->
-                  <!--：<%#= format_activity_day(act.created_on) %> <%#= format_time(act.created_on, false) %></p>-->
-              <!--</div>-->
-              <!--<div class="cl"></div>-->
-            <!--</div>-->
+        <% when "Commit" %>
+            <%= render :partial => 'projects/project_commit', :locals => {:activity => activity.forge_act, :user_activity_id => activity.id } %>
         <% end %>
     <% end %>
 <% end %>

app/views/projects/_project_commit.html.erb

@@ -0,0 +1,28 @@
+<% project = Project.find(activity.project_id) %>
+<% user = get_user_by_mail(activity.committer) %>
+<div class="resources mt10">
+  <div class="homepagePostBrief">
+    <div class="homepagePostPortrait">
+      <%= link_to image_tag(url_to_avatar(user), :width => "50", :height => "50"), user_path(user), :alt => "用户头像" %>
+      <%= render :partial => 'users/show_detail_info', :locals => {:user => user} %>
+    </div>
+    <div class="homepagePostDes">
+      <div class="homepagePostTo break_word">
+        <% if user.try(:realname) == ' ' %>
+            <%= link_to user, user_path(user), :class => "newsBlue mr15" %>
+        <% else %>
+            <%= link_to user.try(:realname), user_path(user), :class => "newsBlue mr15" %>
+        <% end %>
+        TO
+        <%= link_to project.to_s+" | 项目代码提交", project_path(project.id,:host=>Setting.host_course), :class => "newsBlue ml15" %>
+      </div>
+      <div class="homepagePostTitle break_word" >
+        <%= link_to activity.comments, {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :changeset => activity.version}, :class => "postGrey" %>
+      </div>
+      <div class="homepagePostDate">
+        提交时间：<%= format_time(activity.committed_on) %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div>