##// END OF EJS Templates
Added a warning when a new user or group membership is invalid. #3834...
Jean-Baptiste Barth -
r3820:0cfa757db0be
parent child
Show More
@@ -141,14 +141,22 class GroupsController < ApplicationController
141 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
141 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
142 @membership.save if request.post?
142 @membership.save if request.post?
143 respond_to do |format|
143 respond_to do |format|
144 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
144 if @membership.valid?
145 format.js {
145 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
146 render(:update) {|page|
146 format.js {
147 page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
147 render(:update) {|page|
148 page.visual_effect(:highlight, "member-#{@membership.id}")
148 page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
149 }
149 page.visual_effect(:highlight, "member-#{@membership.id}")
150 }
150 }
151 end
151 }
152 else
153 format.js {
154 render(:update) {|page|
155 page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
156 }
157 }
158 end
159 end
152 end
160 end
153
161
154 def destroy_membership
162 def destroy_membership
@@ -123,14 +123,22 class UsersController < ApplicationController
123 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
123 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
124 @membership.save if request.post?
124 @membership.save if request.post?
125 respond_to do |format|
125 respond_to do |format|
126 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
126 if @membership.valid?
127 format.js {
127 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
128 render(:update) {|page|
128 format.js {
129 page.replace_html "tab-content-memberships", :partial => 'users/memberships'
129 render(:update) {|page|
130 page.visual_effect(:highlight, "member-#{@membership.id}")
130 page.replace_html "tab-content-memberships", :partial => 'users/memberships'
131 }
131 page.visual_effect(:highlight, "member-#{@membership.id}")
132 }
132 }
133 end
133 }
134 else
135 format.js {
136 render(:update) {|page|
137 page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
138 }
139 }
140 end
141 end
134 end
142 end
135
143
136 def destroy_membership
144 def destroy_membership
General Comments 0
You need to be logged in to leave comments. Login now