ref: refs/heads/master commit ab0b5faedefc16ca3523c2d4ed496b41741d17f3 Author: J. Daniel Schmidt Date: Sat Nov 14 02:52:32 2009 +0100 fix default registration context, cleanup show templates --- plugins/registration/app/models/register.rb | 6 +++--- .../views/registration/registration/show.html.erb | 12 +----------- .../views/registration/registration/show.json.erb | 2 +- .../views/registration/registration/show.xml.erb | 2 +- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/plugins/registration/app/models/register.rb b/plugins/registration/app/models/register.rb index 6ea7e1f..64e557c 100644 --- a/plugins/registration/app/models/register.rb +++ b/plugins/registration/app/models/register.rb @@ -51,9 +51,9 @@ class Register 'norefresh' => '1', 'restoreRepos' => '1', 'forcereg' => '1', - 'nohwdata' => '1', - 'nooptional' => '1', - 'debugMode' => '2', + 'nohwdata' => '0', + 'nooptional' => '0', + 'debug' => '2', 'logfile' => Paths::REGISTRATION_LOG } @context.merge! hash if hash.kind_of?(Hash) end diff --git a/plugins/registration/app/views/registration/registration/show.html.erb b/plugins/registration/app/views/registration/registration/show.html.erb index 50e8aac..bbba3c0 100644 --- a/plugins/registration/app/views/registration/registration/show.html.erb +++ b/plugins/registration/app/views/registration/registration/show.html.erb @@ -1,11 +1 @@ -<%= # @register == nil ? "@register is nil - FIXME" : @register.to_xml - -%> -<%= case @register.class.to_s - when 'NilClass' - "@register is nil" - when 'String' - @register.to_s - when 'Register' - @register.to_xml - end - -%> +<%= @register.to_xml if @register -%> \ No newline at end of file diff --git a/plugins/registration/app/views/registration/registration/show.json.erb b/plugins/registration/app/views/registration/registration/show.json.erb index 7ae26cf..54ced2c 100644 --- a/plugins/registration/app/views/registration/registration/show.json.erb +++ b/plugins/registration/app/views/registration/registration/show.json.erb @@ -1 +1 @@ -<%= @register == nil ? "@register is nil - FIXME" : @register.to_json -%> +<%= @register.to_json if @register -%> \ No newline at end of file diff --git a/plugins/registration/app/views/registration/registration/show.xml.erb b/plugins/registration/app/views/registration/registration/show.xml.erb index e17faf8..bbba3c0 100644 --- a/plugins/registration/app/views/registration/registration/show.xml.erb +++ b/plugins/registration/app/views/registration/registration/show.xml.erb @@ -1 +1 @@ -<%= @register == nil ? "@register is nil - FIXME" : @register.to_xml -%> +<%= @register.to_xml if @register -%> \ No newline at end of file -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org