From 10dedcb7be406c5864d29457e5a10499477516d8 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 16 Nov 2015 15:39:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=BB=87=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8A=A0=E5=85=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/org_member_controller.rb            |  2 +-
 app/views/organizations/_org_members.html.erb       |  5 ++++-
 .../20151116070906_add_created_at_to_org_members.rb |  5 +++++
 .../20151116071721_set_time_for_org_member.rb       | 13 +++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20151116070906_add_created_at_to_org_members.rb
 create mode 100644 db/migrate/20151116071721_set_time_for_org_member.rb

diff --git a/app/controllers/org_member_controller.rb b/app/controllers/org_member_controller.rb
index 4b842f9dc..642a100c3 100644
--- a/app/controllers/org_member_controller.rb
+++ b/app/controllers/org_member_controller.rb
@@ -16,7 +16,7 @@ class OrgMemberController < ApplicationController
       member_ids = params[:membership][:user_ids]
       role_id = params[:orgRole]
       member_ids.each do |user_id|
-        member =  OrgMember.create(:user_id=>user_id)
+        member =  OrgMember.create(:user_id=>user_id, :created_at => Time.now)
         @org.org_members << member
         OrgMemberRole.create(:org_member_id => member.id, :role_id => role_id)
       end
diff --git a/app/views/organizations/_org_members.html.erb b/app/views/organizations/_org_members.html.erb
index 3940a6576..ee15e19d7 100644
--- a/app/views/organizations/_org_members.html.erb
+++ b/app/views/organizations/_org_members.html.erb
@@ -5,7 +5,7 @@
     </div>
     <div class="st_list" style="width: 720px;">
       <div class="st_box">
-        <!--<span class="fr fb fontGrey3">加入时间</span>-->
+        <span class="fr fb fontGrey3">加入时间</span>
         <div class="cl"></div><!--st_box_top end-->
 
         <% members.each do |member| %>
@@ -16,6 +16,9 @@
               <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
               <%= link_to(member.user.show_name, user_path(member.user),:class => "ml5 c_blue02") %><br />
               <span class="fl c_grey ml10">身份：<%= member.user.admin_of_org?(organization)?"组织管理员":"组织成员" %></span>
+              <% if member.created_at %>
+                 <span class="fr c_grey"><%= format_time(member.created_at) %></span>
+              <% end %>
             </div>
             <div class="cl"></div>
         <% end%>
diff --git a/db/migrate/20151116070906_add_created_at_to_org_members.rb b/db/migrate/20151116070906_add_created_at_to_org_members.rb
new file mode 100644
index 000000000..33d3a2817
--- /dev/null
+++ b/db/migrate/20151116070906_add_created_at_to_org_members.rb
@@ -0,0 +1,5 @@
+class AddCreatedAtToOrgMembers < ActiveRecord::Migration
+  def change
+    add_column :org_members, :created_at, :timestamp
+  end
+end
diff --git a/db/migrate/20151116071721_set_time_for_org_member.rb b/db/migrate/20151116071721_set_time_for_org_member.rb
new file mode 100644
index 000000000..f9e78dff5
--- /dev/null
+++ b/db/migrate/20151116071721_set_time_for_org_member.rb
@@ -0,0 +1,13 @@
+class SetTimeForOrgMember < ActiveRecord::Migration
+  def up
+    OrgMember.all.each do |member|
+      if(member.created_at.nil?)
+        member.created_at = Time.now - 5.days
+        member.save
+      end
+    end
+  end
+
+  def down
+  end
+end