##// END OF EJS Templates
Merged r3934 from trunk....
Eric Davis -
r3870:5345a2dd8979
parent child
Show More
@@ -141,6 +141,7 class GroupsController < ApplicationController
141 141 @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
142 142 @membership.save if request.post?
143 143 respond_to do |format|
144 if @membership.valid?
144 145 format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
145 146 format.js {
146 147 render(:update) {|page|
@@ -148,6 +149,13 class GroupsController < ApplicationController
148 149 page.visual_effect(:highlight, "member-#{@membership.id}")
149 150 }
150 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
151 159 end
152 160 end
153 161
@@ -123,6 +123,7 class UsersController < ApplicationController
123 123 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
124 124 @membership.save if request.post?
125 125 respond_to do |format|
126 if @membership.valid?
126 127 format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
127 128 format.js {
128 129 render(:update) {|page|
@@ -130,6 +131,13 class UsersController < ApplicationController
130 131 page.visual_effect(:highlight, "member-#{@membership.id}")
131 132 }
132 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
133 141 end
134 142 end
135 143
General Comments 0
You need to be logged in to leave comments. Login now