ref: refs/heads/master
commit 2675fbdd8857c968524e35cae99c5943a92657dd
Author: Martin Kudlvasr
Date: Wed Nov 11 17:10:08 2009 +0100
fix bnc#554573 basesystem can continue without accepting the license
---
plugins/eulas/app/controllers/eulas_controller.rb | 5 +++--
.../eulas/test/functional/eulas_controller_test.rb | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/plugins/eulas/app/controllers/eulas_controller.rb b/plugins/eulas/app/controllers/eulas_controller.rb
index cee7076..b408bcd 100644
--- a/plugins/eulas/app/controllers/eulas_controller.rb
+++ b/plugins/eulas/app/controllers/eulas_controller.rb
@@ -63,9 +63,10 @@ class EulasController < ApplicationController
@eula.text = ""
@eula.available_langs = []
@eula.id = @eula_id # XXX Why is this not set by the load_proxy !!!!
- if params[:accepted]
+ accepted = (params[:accepted] == "true") || (params[:accepted] == true)
+ if accepted
unless @eula.accepted
- @eula.accepted = params[:accepted]
+ @eula.accepted = accepted
@eula.save # do not save again if there is no change
end
if @eula_count == @eula_id
diff --git a/plugins/eulas/test/functional/eulas_controller_test.rb b/plugins/eulas/test/functional/eulas_controller_test.rb
index 87d0ac1..8d91363 100644
--- a/plugins/eulas/test/functional/eulas_controller_test.rb
+++ b/plugins/eulas/test/functional/eulas_controller_test.rb
@@ -60,7 +60,10 @@ class EulasControllerTest < ActionController::TestCase
def test_eula_step
@opensuse_eula.accepted = false
get :index
- post :update, "accepted" => true, "id" => "1"
+ post :update, "accepted" => "false", "id" => "1"
+ assert_false( @opensuse_eula.accepted )
+ assert_redirected_to "/eulas/show/1"
+ post :update, "accepted" => "true", "id" => "1"
assert( @opensuse_eula.accepted )
assert_redirected_to "/eulas/show/2"
post :update, "accepted" => false, "id" => "2"
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
