From e40f1a570e9993b0d3000a03572950b75a414ea7 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 3 Jun 2015 18:11:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E4=BB=B6=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb             |  3 ++-
 app/models/invite_list.rb                          | 12 ++++++++++--
 app/models/mailer.rb                               |  1 +
 app/models/project.rb                              |  2 +-
 app/views/projects/invite_members_by_mail.html.erb |  7 ++++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index fbafd16e9..3c34aa549 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -363,7 +363,8 @@ class ProjectsController < ApplicationController
 
   #发送邮件邀请新用户
   def invite_members_by_mail
-    if User.current.member_of?(@project) || User.current.admin? 
+    if User.current.member_of?(@project) || User.current.admin?
+      @inviter_lists = InviteList.where(project_id:@project.id).all
       @is_zhuce = false
       respond_to do |format|
         format.html
diff --git a/app/models/invite_list.rb b/app/models/invite_list.rb
index f1ba8546f..4868fc3d7 100644
--- a/app/models/invite_list.rb
+++ b/app/models/invite_list.rb
@@ -1,5 +1,13 @@
 class InviteList < ActiveRecord::Base
   attr_accessible :project_id, :user_id
-  # belongs_to :user
-  # belongs_to :project
+  belongs_to :user
+  belongs_to :project
+
+  # 用户拒绝邀请后，删除记录
+  def self.delete_inviter(userid, projectid)
+    @inviters = AppliedProject.where("user_id = ? and project_id = ?", userid, projectid)
+    @inviters.each do |inviter|
+      inviter.destroy
+    end
+  end
 end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index c13334b08..001d1b1f6 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -58,6 +58,7 @@ class Mailer < ActionMailer::Base
     us = UsersService.new
     # 自动激活用户
     user = us.register_auto(login, @email, @password)
+    InviteList.create(:user_id => user.id, :project_id => project.id)
     User.current = user unless User.current.nil?
     @user = user
 
diff --git a/app/models/project.rb b/app/models/project.rb
index bf94df248..249df8640 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -67,7 +67,7 @@ class Project < ActiveRecord::Base
   has_many :student, :through => :students_for_courses, :source => :user
   has_one :course_extra, :class_name => 'Course', :foreign_key => :extra,:primary_key => :identifier, :dependent => :destroy
   has_many :applied_projects
-  # has_many :invite_lists
+  has_many :invite_lists
 
   # end
   #ADDED BY NIE
diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb
index 7f952cb3c..7cad9bff3 100644
--- a/app/views/projects/invite_members_by_mail.html.erb
+++ b/app/views/projects/invite_members_by_mail.html.erb
@@ -80,4 +80,9 @@
 			<% end %>
 		</div>
 
-</div>
\ No newline at end of file
+</div>
+
+<div><% @inviter_lists.each do |inviter_list| %>
+        <%= inviter_list.user.name %>
+        <% end
+        %></div>
\ No newline at end of file