jro_apps/redmine Commit - r4430:599bc450730b

Adds support for requesting information about current user using /users/current (#7141)....

Jean-Philippe Lang -

r4430:599bc450730b

parent child

Context file:

r4430:599bc450730b

Collapse all files

app/controllers/users_controller.rb +14 -10

               layout 'admin'
               before_filter :require_admin, :except => :show
+              before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership]
               accept_key_auth :index, :show, :create, :update
               helper :sort
               end
               def show
-                @user = User.find(params[:id])
                 # show projects based on current user visibility
                 @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current))
                   format.html { render :layout => 'base' }
                   format.api
                 end
-              rescue ActiveRecord::RecordNotFound
-                render_404
               end
               def new
               end
               def edit
-                @user = User.find(params[:id])
                 @auth_sources = AuthSource.find(:all)
                 @membership ||= Member.new
               end
               verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
               def update
-                @user = User.find(params[:id])
                 @user.admin = params[:user][:admin] if params[:user][:admin]
                 @user.login = params[:user][:login] if params[:user][:login]
                 if params[:user][:password].present? && (@user.auth_source_id.nil? || params[:user][:auth_source_id].blank?)
               end
               def edit_membership
-                @user = User.find(params[:id])
                 @membership = Member.edit_membership(params[:membership_id], params[:membership], @user)
                 @membership.save if request.post?
                 respond_to do |format|
               end
               def destroy_membership
-                @user = User.find(params[:id])
                 @membership = Member.find(params[:membership_id])
                 if request.post? && @membership.deletable?
                   @membership.destroy
                   format.js { render(:update) {|page| page.replace_html "tab-content-memberships", :partial => 'users/memberships'} }
                 end
               end
+              private
+              def find_user
+                if params[:id] == 'current'
+                  require_login || return
+                  @user = User.current
+                else
+                  @user = User.find(params[:id])
+                end
+              rescue ActiveRecord::RecordNotFound
+                render_404
+              end
             end

test/functional/users_controller_test.rb +14 0

@@ -120,6 +120,20 class UsersControllerTest < ActionController::TestCase
120	assert project_ids.include?(2) #private project admin can see	120	assert project_ids.include?(2) #private project admin can see
121	end	121	end
122		122
		123	def test_show_current_should_require_authentication
		124	@request.session[:user_id] = nil
		125	get :show, :id => 'current'
		126	assert_response 302
		127	end
		128
		129	def test_show_current
		130	@request.session[:user_id] = 2
		131	get :show, :id => 'current'
		132	assert_response :success
		133	assert_template 'show'
		134	assert_equal User.find(2), assigns(:user)
		135	end
		136
123	def test_new	137	def test_new
124	get :new	138	get :new
125		139

test/integration/api_test/users_test.rb +17 0

@@ -50,6 +50,23 class ApiTest::UsersTest < ActionController::IntegrationTest
50	end	50	end
51	end	51	end
52	end	52	end
		53
		54	context "GET /users/current" do
		55	context ".xml" do
		56	should "require authentication" do
		57	get '/users/current.xml'
		58
		59	assert_response 401
		60	end
		61
		62	should "return current user" do
		63	get '/users/current.xml', {}, :authorization => credentials('jsmith')
		64
		65	assert_tag :tag => 'user',
		66	:child => {:tag => 'id', :content => '2'}
		67	end
		68	end
		69	end
53		70
54	context "POST /users" do	71	context "POST /users" do
55	context "with valid parameters" do	72	context "with valid parameters" do

test/integration/routing_test.rb +1 0

               context "users" do
                 should_route :get, "/users", :controller => 'users', :action => 'index'
                 should_route :get, "/users/44", :controller => 'users', :action => 'show', :id => '44'
+                should_route :get, "/users/current", :controller => 'users', :action => 'show', :id => 'current'
                 should_route :get, "/users/new", :controller => 'users', :action => 'new'
                 should_route :get, "/users/444/edit", :controller => 'users', :action => 'edit', :id => '444'
                 should_route :get, "/users/222/edit/membership", :controller => 'users', :action => 'edit', :id => '222', :tab => 'membership'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages