修复:新建组织关联trustie-forge项目,点击组织动态的论坛动态报500

This commit is contained in:
daiao 2016-08-24 14:41:26 +08:00
parent 5088770214
commit 078900088a
2 changed files with 7 additions and 1 deletions

View File

@ -18,6 +18,12 @@ module OrganizationsHelper
s + content_tag('ul', links,:class => 'wlist',:style=>'float:left !important', :id => "org_member_pagination_links" )
end
# 获取项目动态更新时间
def get_forge_act_message(act, type)
forge_act = ForgeActivity.where(:forge_act_id => act.id, :forge_act_type => type).first
format_time(forge_act.nil? ? act.created_on : forge_act.try(:updated_at))
end
def get_default_name field
case field.name
when 'activity' then

View File

@ -29,7 +29,7 @@
发帖时间:<%= format_time(activity.created_on) %>
</div>
<div class="homepagePostDate fl ml15">
更新时间:<%= format_time(ForgeActivity.where("forge_act_type='#{activity.class}' and forge_act_id =#{activity.id}").first.updated_at) %>
更新时间:<%= get_forge_act_message(activity, activity.class) %>
</div>
<div class="cl"></div>
<% if activity.parent_id.nil? %>