From e4b2092c7fea78d8c7c10491a2b4052b02e22e20 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 14 Apr 2015 16:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=A1=B9=E7=9B=AE=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=88=90=E5=91=98?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E7=94=A8=E6=88=B7/=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=95=99=E7=A9=BA=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb         |  5 +++-
 app/views/members/create.js.erb               | 26 ++++++-------------
 .../projects/settings/_new_members.html.erb   |  1 -
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index fc243741a..2a5c7f118 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -117,9 +117,12 @@ class MembersController < ApplicationController
             format.html { redirect_to invite_members_project_url(@project) }
           end
         else
+          unless members.present? && members.all? {|m| m.valid? }
+            @project_error_message = members.empty? ? l(:label_user_role_null) :members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')
+          end
           respond_to do |format|
             format.html { redirect_to_settings_in_projects }
-            format.js { @members = members; @applied_members = applied_members; }
+            format.js
             format.api {
               @member = members.first
               if @member.valid?
diff --git a/app/views/members/create.js.erb b/app/views/members/create.js.erb
index 941582c04..2e7af18d8 100644
--- a/app/views/members/create.js.erb
+++ b/app/views/members/create.js.erb
@@ -1,20 +1,11 @@
 <%if @project%>
-$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
-
-    <%if !@applied_members%>
-        <% if @members.present? && @members.all? {|m| m.valid? } %>
-            <% @members.each do |member| %>
-                $("#member-<%= member.id %>").effect("highlight");
-            <% end %>
-        <% else %>
-            <% if @members %>
-                <% errors = @members.collect {|m| m.errors.full_messages}.flatten.uniq.join(', ')%>
-                    alert('<%= raw(escape_javascript(l(:notice_failed_to_save_members, :errors => errors || ''))) %>');
-            <% end%>
-        <% end %>
-    <% end %>
-
-
+    <% if @project_error_message%>
+        alert("<%= @project_error_message%>");
+    <% else%>
+        $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
+        hideOnLoad();
+        alert("添加成功");
+    <% end%>
 <%elsif @course%>
     <% if @create_member_error_messages%>
         alert("<%= @create_member_error_messages%>");
@@ -22,6 +13,5 @@ $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projec
         $('#tbc_02').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
         alert("添加成功");
     <% end%>
+    hideOnLoad();
 <%end%>
-
-hideOnLoad();
diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb
index d8b75775b..82ed52d9a 100644
--- a/app/views/projects/settings/_new_members.html.erb
+++ b/app/views/projects/settings/_new_members.html.erb
@@ -90,7 +90,6 @@
   <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>
   <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
       <div class="member_search">
-        <input hidden="hidden" value="true" name="flag">
         <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
         <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
         <div class="cl"></div>