From e09cc195a7400187e7b59f7ff24273962d9912d7 Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Wed, 16 Oct 2013 22:28:39 +0500 Subject: fix variable name --- lib/api/helpers.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api') diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 2b0c672c7fa..2cac04d3495 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -16,7 +16,7 @@ module API rescue => ex not_found!("No user id or username for: #{identifier}") end - not_found!("No user id or username for: #{identifier}") if current_user.nil? + not_found!("No user id or username for: #{identifier}") if @current_user.nil? end @current_user end -- cgit v1.2.1 From 12420a2256168a122b3a1f5a2c974df52fe802ec Mon Sep 17 00:00:00 2001 From: Nihad Abbasov Date: Wed, 16 Oct 2013 22:31:46 +0500 Subject: refactor by_username_or_id --- lib/api/helpers.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'lib/api') diff --git a/lib/api/helpers.rb b/lib/api/helpers.rb index 2cac04d3495..1db1f396389 100644 --- a/lib/api/helpers.rb +++ b/lib/api/helpers.rb @@ -11,11 +11,7 @@ module API # If the sudo is the current user do nothing if (identifier && !(@current_user.id == identifier || @current_user.username == identifier)) render_api_error!('403 Forbidden: Must be admin to use sudo', 403) unless @current_user.is_admin? - begin - @current_user = User.by_username_or_id(identifier) - rescue => ex - not_found!("No user id or username for: #{identifier}") - end + @current_user = User.by_username_or_id(identifier) not_found!("No user id or username for: #{identifier}") if @current_user.nil? end @current_user -- cgit v1.2.1