ref: refs/heads/dmacvicar_log_viewer commit 0ec77d9b407d1f00a054a5d11ea86a037757279f Author: Josef Reidinger Date: Thu Sep 3 13:35:13 2009 +0200 remove load_proxy as basesystem doesn't have permissions --- .../app/controllers/controlpanel_controller.rb | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/webclient/app/controllers/controlpanel_controller.rb b/webclient/app/controllers/controlpanel_controller.rb index eb543ba..97cdb17 100644 --- a/webclient/app/controllers/controlpanel_controller.rb +++ b/webclient/app/controllers/controlpanel_controller.rb @@ -137,15 +137,11 @@ class ControlpanelController < ApplicationController redirect_to :action => :basesystem return true else - basesystem = load_proxy 'org.opensuse.yast.modules.basesystem' - unless basesystem - erase_redirect_results #reset all error redirects - erase_render_results #erase all error render - flash.clear #no error flash from load_proxy - logger.warn "Error occured during loading basesystem information" - return false - end - + proxy = YaST::ServiceResource.proxy_for 'org.opensuse.yast.modules.basesystem' + return false unless proxy + basesystem = proxy.find + return false unless basesystem + if basesystem.steps.empty? or basesystem.finish session[:wizard_current] = FINAL_STEP return false -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org