From e4e56e01b1891fe38027d429081760a3f102bf69 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 13 Mar 2015 17:46:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E7=94=A8=E6=88=B7=E5=A4=B1=E8=B4=A5=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index d0be72961..ba312c74a 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -99,7 +99,7 @@ class MembersController < ApplicationController
           @project.members << members
           # added by nie
           @project.project_infos << project_info
-          @project.user_grades << user_grades
+          @project.user_grades << user_grades unless user_grades.first.user_id.nil?
           # end
         end
         if members.present? && members.all? { |m| m.valid? }
@@ -108,7 +108,11 @@ class MembersController < ApplicationController
           end
         end
         if params[:flag]
-          flash[:notice] = l(:label_invite_success)
+          unless members.present? && members.all? {|m| m.valid? }
+            flash[:error] = members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
+          else
+            flash[:notice] = l(:label_invite_success)
+          end
           respond_to do |format|
             format.html { redirect_to invite_members_project_url(@project) }
           end