diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 127fa5d3a..d8e583bf7 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -47,6 +47,8 @@ class MembersController < ApplicationController def create if params[:refusal_button] + members = [] + applied_members = true if params[:membership] if params[:membership][:user_ids] attrs = params[:membership].dup @@ -57,6 +59,7 @@ class MembersController < ApplicationController end end else + applied_members = false members = [] project_info = [] user_grades = [] @@ -94,7 +97,7 @@ class MembersController < ApplicationController respond_to do |format| format.html { redirect_to_settings_in_projects } - format.js { @members = members;@applied_members = members; } + format.js { @members = members;@applied_members = applied_members; } 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 11c468a76..88089f843 100644 --- a/app/views/members/create.js.erb +++ b/app/views/members/create.js.erb @@ -1,6 +1,7 @@ $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>'); hideOnLoad(); +<%if !@applied_members%> <% if @members.present? && @members.all? {|m| m.valid? } %> <% @members.each do |member| %> $("#member-<%= member.id %>").effect("highlight"); @@ -9,3 +10,4 @@ hideOnLoad(); <% 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%>