From 078900088add679a86e4be15fe133befe839a91e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 24 Aug 2016 14:41:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=96=B0=E5=BB=BA?=
=?UTF-8?q?=E7=BB=84=E7=BB=87=E5=85=B3=E8=81=94trustie-forge=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=EF=BC=8C=E7=82=B9=E5=87=BB=E7=BB=84=E7=BB=87=E5=8A=A8?=
=?UTF-8?q?=E6=80=81=E7=9A=84=E8=AE=BA=E5=9D=9B=E5=8A=A8=E6=80=81=E6=8A=A5?=
=?UTF-8?q?500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/organizations_helper.rb | 6 ++++++
app/views/users/_project_message.html.erb | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb
index 48b5f068b..048d92458 100644
--- a/app/helpers/organizations_helper.rb
+++ b/app/helpers/organizations_helper.rb
@@ -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
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 0a5c18a9b..9727b685c 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -29,7 +29,7 @@
发帖时间：<%= format_time(activity.created_on) %>
- 更新时间：<%= 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) %>
<% if activity.parent_id.nil? %>