Skip to content

O
OHR Support
Commit 5345a2dd authored by Eric Davis's avatar Eric Davis
Browse files
Options

Merged r3934 from trunk. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3984 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 7ca197b3
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 16 deletions
app/controllers/groups_controller.rb
View file @ 5345a2dd
...@@ -141,14 +141,22 @@ class GroupsController < ApplicationController ...@@ -141,14 +141,22 @@ class GroupsController < ApplicationController
@membership = Member.edit_membership(params[:membership_id], params[:membership], @group) @membership = Member.edit_membership(params[:membership_id], params[:membership], @group)
@membership.save if request.post? @membership.save if request.post?
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' } if @membership.valid?
format.js { format.html { redirect_to :controller => 'groups', :action => 'edit', :id => @group, :tab => 'memberships' }
render(:update) {|page| format.js {
page.replace_html "tab-content-memberships", :partial => 'groups/memberships' render(:update) {|page|
page.visual_effect(:highlight, "member-#{@membership.id}") page.replace_html "tab-content-memberships", :partial => 'groups/memberships'
} page.visual_effect(:highlight, "member-#{@membership.id}")
} }
end }
else
format.js {
render(:update) {|page|
page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
}
}
end
end
end end
def destroy_membership def destroy_membership
......
app/controllers/users_controller.rb
View file @ 5345a2dd
...@@ -123,14 +123,22 @@ class UsersController < ApplicationController ...@@ -123,14 +123,22 @@ class UsersController < ApplicationController
@membership = Member.edit_membership(params[:membership_id], params[:membership], @user) @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
@membership.save if request.post? @membership.save if request.post?
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' } if @membership.valid?
format.js { format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' }
render(:update) {|page| format.js {
page.replace_html "tab-content-memberships", :partial => 'users/memberships' render(:update) {|page|
page.visual_effect(:highlight, "member-#{@membership.id}") page.replace_html "tab-content-memberships", :partial => 'users/memberships'
} page.visual_effect(:highlight, "member-#{@membership.id}")
} }
end }
else
format.js {
render(:update) {|page|
page.alert(l(:notice_failed_to_save_members, :errors => @membership.errors.full_messages.join(', ')))
}
}
end
end
end end
def destroy_membership def destroy_membership
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment