ref: refs/heads/backgroud_patches_bnc550934
commit 6ec9fa5ef77e0ef7567312ad91c703a824d984b9
Author: Josef Reidinger
Date: Fri Nov 13 14:56:44 2009 +0100
fix endless loop if you don't have permission to run first module of basesystem (bnc#554989)
---
.../app/controllers/controlpanel_controller.rb | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/webclient/app/controllers/controlpanel_controller.rb b/webclient/app/controllers/controlpanel_controller.rb
index 528af8b..729372b 100644
--- a/webclient/app/controllers/controlpanel_controller.rb
+++ b/webclient/app/controllers/controlpanel_controller.rb
@@ -126,9 +126,8 @@ class ControlpanelController < ApplicationController
if Basesystem.initialized?(session)
# session variable is used to find out, if basic system module is needed
return false if Basesystem.done? session
- # basic system setup in progress => redirect to current module
-#TODO this should not happen, render mkudlvasr page
- redirect_to Basesystem.current_target(session)
+ # error happen during basesystem, so show this page (prevent endless loop bnc#554989)
+ render :action => "basesystem"
return true
else
proxy = YaST::ServiceResource.proxy_for 'org.opensuse.yast.modules.basesystem'
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org