From 7dccf9fda6f30d8f4b0c5eaad9f6e2a1e67cd643 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 10 May 2009 10:54:31 +0000 Subject: Allows multiple roles on the same project (#706). Prerequisite for user groups feature. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2726 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/users_controller.rb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'app/controllers/users_controller.rb') diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e0b508c7b..72a4b6c83 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -86,10 +86,7 @@ class UsersController < ApplicationController end end @auth_sources = AuthSource.find(:all) - @roles = Role.find_all_givable - @projects = Project.active.find(:all, :order => 'lft') @membership ||= Member.new - @memberships = @user.memberships end def edit_membership @@ -97,12 +94,23 @@ class UsersController < ApplicationController @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user) @membership.attributes = params[:membership] @membership.save if request.post? - redirect_to :action => 'edit', :id => @user, :tab => 'memberships' + respond_to do |format| + format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' } + format.js { + render(:update) {|page| + page.replace_html "tab-content-memberships", :partial => 'users/memberships' + page.visual_effect(:highlight, "member-#{@membership.id}") + } + } + end end def destroy_membership @user = User.find(params[:id]) Member.find(params[:membership_id]).destroy if request.post? - redirect_to :action => 'edit', :id => @user, :tab => 'memberships' + respond_to do |format| + format.html { redirect_to :controller => 'users', :action => 'edit', :id => @user, :tab => 'memberships' } + format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} } + end end end -- cgit v1.2.3