jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

项目附件动态展开更多过滤条件中含有issue问题

This commit is contained in:
huang 2016-10-28 11:04:12 +08:00
parent 7e2834f680
commit 40620d139d
2 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View File

@ -326,7 +326,7 @@ class ProjectsController < ApplicationController
else else
@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); @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 end
@type = params[:type]
# 版本库统计图 # 版本库统计图
# unless @project.gpid.nil? || @project.project_score.changeset_num == 0 # unless @project.gpid.nil? || @project.project_score.changeset_num == 0
# # rep_statics_commit = @project.rep_statics.order("commits_num desc") # # rep_statics_commit = @project.rep_statics.order("commits_num desc")

7
app/views/projects/_project_attachment.html.erb
View File

@ -1,4 +1,5 @@
<div class="container-big mt10"> <% unless activity.nil? %>
<div class="container-big mt10">
<div class="pr"> <div class="pr">
<div class="homepagePostPortrait"> <div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %> <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "用户头像" %>
@ -23,4 +24,6 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>
<% end %>