Signed-off-by: Scott Seago sseago@redhat.com --- src/app/controllers/application_controller.rb | 4 ---- src/app/controllers/instance_controller.rb | 2 +- 2 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index bc560b9..142a6bf 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -46,10 +46,6 @@ class ApplicationController < ActionController::Base return 'dcloud' end
- def get_login_user - "deltacloudadmin" - end - def get_nav_items @providers = Provider.find(:all) end diff --git a/src/app/controllers/instance_controller.rb b/src/app/controllers/instance_controller.rb index 8893286..fc05113 100644 --- a/src/app/controllers/instance_controller.rb +++ b/src/app/controllers/instance_controller.rb @@ -69,7 +69,7 @@ class InstanceController < ApplicationController raise ActionError.new("#{action} is an invalid action.") end #permissons check here - @task = @instance.queue_action(get_login_user, action, action_args) + @task = @instance.queue_action(@current_user, action, action_args) unless @task raise ActionError.new("#{action} cannot be performed on this instance.") end