From 312d7660b2555bd9871f0d5ccaf078f62ab4e262 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 12 Mar 2015 16:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=82=80=E8=AF=B7=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E7=9A=84=E6=8F=90=E7=A4=BA=20=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E6=88=90=E5=8A=9F=E5=90=8E=E8=B7=B3=E8=BD=AC=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=20=E8=B0=83=E6=95=B4=E7=BF=BB?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=A7=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/members_controller.rb      | 29 ++++++++++++++--------
 app/views/projects/invite_members.html.erb |  6 +++--
 config/locales/zh.yml                      |  1 +
 public/stylesheets/application.css         |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index a8760a6ef..d0be72961 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -107,17 +107,24 @@ class MembersController < ApplicationController
             AppliedProject.deleteappiled(member.user_id, @project.id)
           end
         end
-        respond_to do |format|
-          format.html { redirect_to_settings_in_projects }
-          format.js { @members = members; @applied_members = applied_members; }
-          format.api {
-            @member = members.first
-            if @member.valid?
-              render :action => 'show', :status => :created, :location => membership_url(@member)
-            else
-              render_validation_errors(@member)
-            end
-          }
+        if params[:flag]
+          flash[:notice] = l(:label_invite_success)
+          respond_to do |format|
+            format.html { redirect_to invite_members_project_url(@project) }
+          end
+        else
+          respond_to do |format|
+            format.html { redirect_to_settings_in_projects }
+            format.js { @members = members; @applied_members = applied_members; }
+            format.api {
+              @member = members.first
+              if @member.valid?
+                render :action => 'show', :status => :created, :location => membership_url(@member)
+              else
+                render_validation_errors(@member)
+              end
+            }
+          end
         end
       elsif @course
         course_info = []
diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb
index e2456f2b1..4b07b9b3e 100644
--- a/app/views/projects/invite_members.html.erb
+++ b/app/views/projects/invite_members.html.erb
@@ -1,7 +1,8 @@
+
 <div class="project_r_h">
   <h2 class="project_h2">邀请加入</h2>
 </div>
-<%= error_messages_for 'member' %>
+<%#= render_flash_messages %>
 <%
    roles = Role.givable.all
    if @project.project_type == Project::ProjectType_course
@@ -21,8 +22,9 @@
     <div class="box_main">
       <h3 class="box_h3">邀请Trustie注册用户</h3>
       <% if roles.any? %>
-          <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
+          <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :method => :post}) do |f| %>
               <div class="invi_search">
+                <input hidden="hidden" value="true" name="flag">
                 <input id="principal_search" class="invi_search_input fl" type="text" placeholder="输入用户名称搜索好友">
                 <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js',:flag => true) }')" %>
                 <div class="cl"></div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 76f14f0da..1ceab9b28 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1887,6 +1887,7 @@ zh:
   label_bids_task_list: 作业列表
   label_join_course: 加入
   label_invite_project: 邀请您加入项目
+  label_invite_success: 邀请成功
   label_invite_members: 邀请用户
   label_exit_course: 退出
   label_exit_group: 退出当前分班
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b934d2dda..c24091605 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -13,7 +13,7 @@ ul.wlist{ margin-left: -40px; border-bottom:none; }
 ul.wlist li{float: left;}
 ul.wlist li a{ border:1px solid #15bccf; padding:4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
-.wlist_select { background-color:#64bdd9; color:#fff; padding: 3px; margin-left:3px;margin-top: -4px; border:1px solid #64bdd9;}
+.wlist_select { background-color:#64bdd9; color:#fff; padding: 4px 3px 3px 3px; margin-left:3px;margin-top: -5px; border:1px solid #64bdd9;}
 
 /*20150203项目界面优化样式  By: huangjignquan*/
 .project_new{font-size: 15px; padding: 5px;}