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 @@

<%= l(:label_member_new) %>

<%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>