ref: refs/heads/master commit 8496ab1c3d54cd5e859750a17b633344c8b47b0a Author: Josef Reidinger Date: Fri Nov 13 16:51:19 2009 +0100 has key ignore symbols (but other Hash functions takes it), use in_process instead of done for decision if redirect to next module, as if backend is not available it should not act as in basesystem --- .../app/controllers/application_controller.rb | 3 ++- webclient/lib/basesystem.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/webclient/app/controllers/application_controller.rb b/webclient/app/controllers/application_controller.rb index 2d926aa..6dffe88 100644 --- a/webclient/app/controllers/application_controller.rb +++ b/webclient/app/controllers/application_controller.rb @@ -7,7 +7,8 @@ class ApplicationController < ActionController::Base layout 'main' def redirect_success - if !Basesystem::done?(session) + logger.debug session.inspect + if Basesystem::in_process?(session) logger.debug "wizard redirect DONE" redirect_to :controller => "controlpanel", :action => "nextstep" else diff --git a/webclient/lib/basesystem.rb b/webclient/lib/basesystem.rb index f12b61d..0019871 100644 --- a/webclient/lib/basesystem.rb +++ b/webclient/lib/basesystem.rb @@ -6,7 +6,7 @@ module Basesystem end def Basesystem.in_process?(session) - session.has_key?(:wizard_steps) && !done?(session) + session.has_key?("wizard_steps") && !done?(session) end def Basesystem.initialized?(session) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org