November 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r59554 - /tags/branch-Code-11-2_17_28/registration/
by jdsn＠svn.opensuse.org 14 Nov '09

14 Nov '09

Author: jdsn Date: Sat Nov 14 04:44:53 2009 New Revision: 59554 URL: http://svn.opensuse.org/viewcvs/yast?rev=59554&view=rev Log: Created tag branch-Code-11-2_17_28 for registration Added: tags/branch-Code-11-2_17_28/registration/ - copied from r59553, branches/SuSE-Code-11-Branch/registration/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59553 - in /branches/SuSE-Code-11-Branch/registration: VERSION package/yast2-registration.changes src/modules/YSR.pm
by jdsn＠svn.opensuse.org 14 Nov '09

14 Nov '09

Author: jdsn Date: Sat Nov 14 04:44:46 2009 New Revision: 59553 URL: http://svn.opensuse.org/viewcvs/yast?rev=59553&view=rev Log: fixes in REST API to prevent server error and loops (bnc#553244) 2.17.28 Modified: branches/SuSE-Code-11-Branch/registration/VERSION branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-Branch/registration/src/modules/YSR.pm Modified: branches/SuSE-Code-11-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registrat… ============================================================================== --- branches/SuSE-Code-11-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-Branch/registration/VERSION Sat Nov 14 04:44:46 2009 @@ -1 +1 @@ -2.17.27 +2.17.28 Modified: branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registrat… ============================================================================== --- branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-Branch/registration/package/yast2-registration.changes Sat Nov 14 04:44:46 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Nov 14 04:35:21 CET 2009 - jdsn(a)suse.de + +- fixes in REST API to prevent server error and loops (bnc#553244) +- 2.17.28 + +------------------------------------------------------------------- Thu Nov 5 13:56:15 CET 2009 - jdsn(a)suse.de - fix XML format for stateless registration API Modified: branches/SuSE-Code-11-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/registrat… ============================================================================== --- branches/SuSE-Code-11-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Code-11-Branch/registration/src/modules/YSR.pm Sat Nov 14 04:44:46 2009 @@ -189,6 +189,7 @@ my $self = shift; my $ctx = shift; my $arguments = shift; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; unless ( defined $ctx && ref($ctx) eq "HASH" ) { @@ -260,8 +261,9 @@ if ( $exitcode == 0 ) { + # successful registration, so we need to save the last ZMD config + $self->saveLastZmdConfig(); $tasklist = $self->getTaskList() || {}; - my $ret = $self->changerepos($tasklist); if ( ref($ret) eq 'HASH' ) @@ -278,7 +280,23 @@ } ${$regret}{'success'} = 'Successfully ran registration'; - ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS" }, NoAttr => 1); + # prepare the tasklist for XML conversion + foreach my $k (keys %{$tasklist}) + { + if ( exists ${${$tasklist}{$k}}{'CATALOGS'} ) + { + ${${$tasklist}{$k}}{'CATALOGS'} = { 'catalog' => ${${$tasklist}{$k}}{'CATALOGS'} }; + } + } + ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS", catalog => "+ALIAS" }, NoAttr => 1); + + # write flagfile for successful registration + open(FLAGFILE, "> $SRregisterFlagFile"); + print FLAGFILE localtime(); + close FLAGFILE; + + # to be on the safe side for a following registration request, we need to delete the context data + $self->del_ctx(); } elsif ( $exitcode == 3 ) { @@ -312,6 +330,7 @@ my $SRconf = '/etc/suseRegister.conf'; my $SRcert = '/etc/ssl/certs/registration-server.pem'; my $SRcredentials = '/etc/zypp/credentials.d/NCCcredentials'; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; my $url = undef; my $cert = undef; @@ -347,8 +366,8 @@ } # read the guid - if (-e $SRcredentials) - { + if ( -e $SRcredentials && -e $SRregisterFlagFile ) + { if (open(CRED, "< $SRcredentials") ) { while(<CRED>) @@ -366,6 +385,9 @@ $cert = '' unless defined $cert; $guid = '' unless defined $guid; + # delete a flagfile that might be still there if no guid is found + unlink($SRregisterFlagFile) if $guid eq ''; + return { "regserverurl" => $url, "regserverca" => $cert, "guid" => $guid }; @@ -472,6 +494,7 @@ foreach $catalog (keys %{$todo}) { + $pAny = ${$todo}{$catalog}; if ( not defined $catalog || $catalog eq '' ) { push @log, "A catalog returned by SuseRegister has no or an invalid name."; @@ -499,7 +522,7 @@ elsif ( ${$pAny}{"TASK"} eq 'a' ) { push @log, "According to SuseRegister a catalog has to be enabled: $catalog ($pService)"; - my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', ${$pAny}{'ALIAS'}); + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', "${$pAny}{'ALIAS'}"); if ( system(@zCMD) == 0 ) { push @log, "Enabled catalog: ${$pAny}{'ALIAS'} ($pService)"; @@ -623,7 +646,7 @@ push @log, "According to SuseRegister a service should be left enabled: $pService"; push @log, "Now checking the catalogs of the service: $pService"; - my @zCMD = ('zypper', '--non-interactive', 'refresh-services', $pService); + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); if ( system(@zCMD) == 0 ) { push @log, "Successfully refreshed service: $pService"; @@ -655,7 +678,7 @@ push @log, "Now checking the catalogs of the service: $pService"; - my @zrCMD = ('zypper', '--non-interactive', 'refresh-services', $pService); + my @zrCMD = ('zypper', '--non-interactive', 'refresh', '--services'); if ( system(@zrCMD) == 0 ) { push @log, "Successfully refreshed service: $pService"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59552 - in /trunk/registration: VERSION package/yast2-registration.changes src/modules/YSR.pm
by jdsn＠svn.opensuse.org 14 Nov '09

14 Nov '09

Author: jdsn Date: Sat Nov 14 04:44:25 2009 New Revision: 59552 URL: http://svn.opensuse.org/viewcvs/yast?rev=59552&view=rev Log: fixes in REST API to prevent server error and loops (bnc#553244) 2.19.1 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/modules/YSR.pm Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=59552&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Sat Nov 14 04:44:25 2009 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Sat Nov 14 04:44:25 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Nov 14 04:37:29 CET 2009 - jdsn(a)suse.de + +- fixes in REST API to prevent server error and loops (bnc#553244) +- 2.19.1 + +------------------------------------------------------------------- Thu Nov 12 20:32:57 CET 2009 - jdsn(a)suse.de - fix catalog checks in stateless registration API Modified: trunk/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/modules/YSR.pm?… ============================================================================== --- trunk/registration/src/modules/YSR.pm (original) +++ trunk/registration/src/modules/YSR.pm Sat Nov 14 04:44:25 2009 @@ -189,6 +189,7 @@ my $self = shift; my $ctx = shift; my $arguments = shift; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; unless ( defined $ctx && ref($ctx) eq "HASH" ) { @@ -278,17 +279,24 @@ ${$regret}{'repochangeerrors'} = $errcount if $errcount > 0; } + ${$regret}{'success'} = 'Successfully ran registration'; # prepare the tasklist for XML conversion foreach my $k (keys %{$tasklist}) { - if (exists ${${$tasklist}{$k}}{'CATALOGS'} ) + if ( exists ${${$tasklist}{$k}}{'CATALOGS'} ) { ${${$tasklist}{$k}}{'CATALOGS'} = { 'catalog' => ${${$tasklist}{$k}}{'CATALOGS'} }; } } + ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS", catalog => "+ALIAS" }, NoAttr => 1); - ${$regret}{'success'} = 'Successfully ran registration'; - ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS" }, NoAttr => 1); + # write flagfile for successful registration + open(FLAGFILE, "> $SRregisterFlagFile"); + print FLAGFILE localtime(); + close FLAGFILE; + + # to be on the safe side for a following registration request, we need to delete the context data + $self->del_ctx(); } elsif ( $exitcode == 3 ) { @@ -322,6 +330,7 @@ my $SRconf = '/etc/suseRegister.conf'; my $SRcert = '/etc/ssl/certs/registration-server.pem'; my $SRcredentials = '/etc/zypp/credentials.d/NCCcredentials'; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; my $url = undef; my $cert = undef; @@ -357,8 +366,8 @@ } # read the guid - if (-e $SRcredentials) - { + if ( -e $SRcredentials && -e $SRregisterFlagFile ) + { if (open(CRED, "< $SRcredentials") ) { while(<CRED>) @@ -376,6 +385,9 @@ $cert = '' unless defined $cert; $guid = '' unless defined $guid; + # delete a flagfile that might be still there if no guid is found + unlink($SRregisterFlagFile) if $guid eq ''; + return { "regserverurl" => $url, "regserverca" => $cert, "guid" => $guid }; @@ -510,7 +522,7 @@ elsif ( ${$pAny}{"TASK"} eq 'a' ) { push @log, "According to SuseRegister a catalog has to be enabled: $catalog ($pService)"; - my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', ${$pAny}{'ALIAS'}); + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', "${$pAny}{'ALIAS'}"); if ( system(@zCMD) == 0 ) { push @log, "Enabled catalog: ${$pAny}{'ALIAS'} ($pService)"; @@ -634,7 +646,7 @@ push @log, "According to SuseRegister a service should be left enabled: $pService"; push @log, "Now checking the catalogs of the service: $pService"; - my @zCMD = ('zypper', '--non-interactive', 'refresh-services', $pService); + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); if ( system(@zCMD) == 0 ) { push @log, "Successfully refreshed service: $pService"; @@ -666,7 +678,7 @@ push @log, "Now checking the catalogs of the service: $pService"; - my @zrCMD = ('zypper', '--non-interactive', 'refresh-services', $pService); + my @zrCMD = ('zypper', '--non-interactive', 'refresh', '--services'); if ( system(@zrCMD) == 0 ) { push @log, "Successfully refreshed service: $pService"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r59551 - in /branches/SuSE-Linux-11_2-Branch/registration: VERSION package/yast2-registration.changes src/modules/YSR.pm
by jdsn＠svn.opensuse.org 14 Nov '09

14 Nov '09

Author: jdsn Date: Sat Nov 14 04:43:52 2009 New Revision: 59551 URL: http://svn.opensuse.org/viewcvs/yast?rev=59551&view=rev Log: fixes in REST API to prevent server error and loops (bnc#553244) 2.18.3 Modified: branches/SuSE-Linux-11_2-Branch/registration/VERSION branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm Modified: branches/SuSE-Linux-11_2-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/VERSION (original) +++ branches/SuSE-Linux-11_2-Branch/registration/VERSION Sat Nov 14 04:43:52 2009 @@ -1 +1 @@ -2.18.2 +2.18.3 Modified: branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Linux-11_2-Branch/registration/package/yast2-registration.changes Sat Nov 14 04:43:52 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Nov 14 04:42:20 CET 2009 - jdsn(a)suse.de + +- fixes in REST API to prevent server error and loops (bnc#553244) +- 2.18.3 + +------------------------------------------------------------------- Thu Nov 5 16:22:53 CET 2009 - jdsn(a)suse.de - fix XML format for stateless registration API Modified: branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_2-Branch/regist… ============================================================================== --- branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm (original) +++ branches/SuSE-Linux-11_2-Branch/registration/src/modules/YSR.pm Sat Nov 14 04:43:52 2009 @@ -189,6 +189,7 @@ my $self = shift; my $ctx = shift; my $arguments = shift; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; unless ( defined $ctx && ref($ctx) eq "HASH" ) { @@ -260,8 +261,9 @@ if ( $exitcode == 0 ) { + # successful registration, so we need to save the last ZMD config + $self->saveLastZmdConfig(); $tasklist = $self->getTaskList() || {}; - my $ret = $self->changerepos($tasklist); if ( ref($ret) eq 'HASH' ) @@ -278,7 +280,23 @@ } ${$regret}{'success'} = 'Successfully ran registration'; - ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS" }, NoAttr => 1); + # prepare the tasklist for XML conversion + foreach my $k (keys %{$tasklist}) + { + if ( exists ${${$tasklist}{$k}}{'CATALOGS'} ) + { + ${${$tasklist}{$k}}{'CATALOGS'} = { 'catalog' => ${${$tasklist}{$k}}{'CATALOGS'} }; + } + } + ${$regret}{'tasklist'} = XMLout( {'item' => $tasklist}, rootname => 'tasklist', KeyAttr => { item => "+ALIAS", catalog => "+ALIAS" }, NoAttr => 1); + + # write flagfile for successful registration + open(FLAGFILE, "> $SRregisterFlagFile"); + print FLAGFILE localtime(); + close FLAGFILE; + + # to be on the safe side for a following registration request, we need to delete the context data + $self->del_ctx(); } elsif ( $exitcode == 3 ) { @@ -312,6 +330,7 @@ my $SRconf = '/etc/suseRegister.conf'; my $SRcert = '/etc/ssl/certs/registration-server.pem'; my $SRcredentials = '/etc/zypp/credentials.d/NCCcredentials'; + my $SRregisterFlagFile = '/var/lib/yastws/registration_successful'; my $url = undef; my $cert = undef; @@ -347,8 +366,8 @@ } # read the guid - if (-e $SRcredentials) - { + if ( -e $SRcredentials && -e $SRregisterFlagFile ) + { if (open(CRED, "< $SRcredentials") ) { while(<CRED>) @@ -366,6 +385,9 @@ $cert = '' unless defined $cert; $guid = '' unless defined $guid; + # delete a flagfile that might be still there if no guid is found + unlink($SRregisterFlagFile) if $guid eq ''; + return { "regserverurl" => $url, "regserverca" => $cert, "guid" => $guid }; @@ -472,6 +494,7 @@ foreach $catalog (keys %{$todo}) { + $pAny = ${$todo}{$catalog}; if ( not defined $catalog || $catalog eq '' ) { push @log, "A catalog returned by SuseRegister has no or an invalid name."; @@ -499,7 +522,7 @@ elsif ( ${$pAny}{"TASK"} eq 'a' ) { push @log, "According to SuseRegister a catalog has to be enabled: $catalog ($pService)"; - my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', ${$pAny}{'ALIAS'}); + my @zCMD = ('zypper', '--non-interactive', 'modifyrepo', '--enable', "${$pAny}{'ALIAS'}"); if ( system(@zCMD) == 0 ) { push @log, "Enabled catalog: ${$pAny}{'ALIAS'} ($pService)"; @@ -623,7 +646,7 @@ push @log, "According to SuseRegister a service should be left enabled: $pService"; push @log, "Now checking the catalogs of the service: $pService"; - my @zCMD = ('zypper', '--non-interactive', 'refresh-services', $pService); + my @zCMD = ('zypper', '--non-interactive', 'refresh', '--services'); if ( system(@zCMD) == 0 ) { push @log, "Successfully refreshed service: $pService"; @@ -655,7 +678,7 @@ push @log, "Now checking the catalogs of the service: $pService"; - my @zrCMD = ('zypper', '--non-interactive', 'refresh-services', $pService); + my @zrCMD = ('zypper', '--non-interactive', 'refresh', '--services'); if ( system(@zrCMD) == 0 ) { push @log, "Successfully refreshed service: $pService"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : adapt index action to behave like other webyast modules fix summary of repo and service changes change details button to link (bnc#555230) visual feedback during registration bnc#(554714) version 0.0.4
by J.Daniel Schmidt 14 Nov '09

14 Nov '09

ref: refs/heads/master commit f3c64406287cd2c73cd5dd49d233d42f66260ffe Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Sat Nov 14 04:18:02 2009 +0100 adapt index action to behave like other webyast modules fix summary of repo and service changes change details button to link (bnc#555230) visual feedback during registration bnc#(554714) version 0.0.4 --- .../package/yast2-webclient-registration.changes | 9 +++++++++ .../package/yast2-webclient-registration.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/plugins/registration/package/yast2-webclient-registration.changes b/plugins/registration/package/yast2-webclient-registration.changes index 0fde670..9a5d684 100644 --- a/plugins/registration/package/yast2-webclient-registration.changes +++ b/plugins/registration/package/yast2-webclient-registration.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sat Nov 14 04:08:25 CET 2009 - jdsn(a)suse.de + +- adapt index action to behave like other webyast modules +- fix summary of repo and service changes +- change details button to link (bnc#555230) +- visual feedback during registration bnc#(554714) +- version 0.0.4 + +------------------------------------------------------------------- Thu Nov 5 13:47:35 CET 2009 - jdsn(a)suse.de - fix parameter handling diff --git a/plugins/registration/package/yast2-webclient-registration.spec b/plugins/registration/package/yast2-webclient-registration.spec index 416c27c..3b4d7f2 100644 --- a/plugins/registration/package/yast2-webclient-registration.spec +++ b/plugins/registration/package/yast2-webclient-registration.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.3 +Version: 0.0.4 Release: 0 Summary: YaST2 - Webclient - Registration Source: www.tar.bz2 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : adapt index action to behave like other webyast modules fix summary of repo and service changes change details button to link (bnc#555230) visual feedback during registration bnc#(554714) version 0.0.4
by J.Daniel Schmidt 14 Nov '09

14 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit f3c64406287cd2c73cd5dd49d233d42f66260ffe Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Sat Nov 14 04:18:02 2009 +0100 adapt index action to behave like other webyast modules fix summary of repo and service changes change details button to link (bnc#555230) visual feedback during registration bnc#(554714) version 0.0.4 --- .../package/yast2-webclient-registration.changes | 9 +++++++++ .../package/yast2-webclient-registration.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/plugins/registration/package/yast2-webclient-registration.changes b/plugins/registration/package/yast2-webclient-registration.changes index 0fde670..9a5d684 100644 --- a/plugins/registration/package/yast2-webclient-registration.changes +++ b/plugins/registration/package/yast2-webclient-registration.changes @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Sat Nov 14 04:08:25 CET 2009 - jdsn(a)suse.de + +- adapt index action to behave like other webyast modules +- fix summary of repo and service changes +- change details button to link (bnc#555230) +- visual feedback during registration bnc#(554714) +- version 0.0.4 + +------------------------------------------------------------------- Thu Nov 5 13:47:35 CET 2009 - jdsn(a)suse.de - fix parameter handling diff --git a/plugins/registration/package/yast2-webclient-registration.spec b/plugins/registration/package/yast2-webclient-registration.spec index 416c27c..3b4d7f2 100644 --- a/plugins/registration/package/yast2-webclient-registration.spec +++ b/plugins/registration/package/yast2-webclient-registration.spec @@ -14,7 +14,7 @@ PreReq: yast2-webclient License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.3 +Version: 0.0.4 Release: 0 Summary: YaST2 - Webclient - Registration Source: www.tar.bz2 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : adaptions for the fix of the internal server error (bnc#553244), version 0.0.7
by J.Daniel Schmidt 14 Nov '09

14 Nov '09

ref: refs/heads/master commit 1077c6401d140f8f2065dc75599a93bbf40d6436 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Sat Nov 14 04:16:38 2009 +0100 adaptions for the fix of the internal server error (bnc#553244), version 0.0.7 --- plugins/registration/app/models/register.rb | 60 +++++++++++--------- .../package/yast2-webservice-registration.changes | 6 ++ .../package/yast2-webservice-registration.spec | 6 +- 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/plugins/registration/app/models/register.rb b/plugins/registration/app/models/register.rb index 64e557c..dd008d1 100644 --- a/plugins/registration/app/models/register.rb +++ b/plugins/registration/app/models/register.rb @@ -102,6 +102,7 @@ class Register end def status_to_xml( options = {} ) + find xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -111,6 +112,7 @@ class Register end def config_to_xml( options = {} ) + find xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -127,6 +129,7 @@ class Register end def to_xml( options = {} ) + find xml = options[:builder] ||= Builder::XmlMarkup.new(options) xml.instruct! unless options[:skip_instruct] @@ -153,15 +156,15 @@ class Register case item when Hash, HashWithIndifferentAccess - tasklist_hash[item['alias']] = item if item.has_key?('alias') + tasklist_hash[item['ALIAS']] = item if item.has_key?('ALIAS') when Array item.each do |i| - tasklist_hash[i['alias']] = i if i.has_key?('alias') + tasklist_hash[i['ALIAS']] = i if i.has_key?('ALIAS') end end - changedrepos = tasklist_hash.reject { | k, v | !v.kind_of?(Hash) || v['type'] != 'zypp' } - changedservices = tasklist_hash.reject { | k, v | !v.kind_of?(Hash) || v['type'] != 'nu' } + changedrepos = tasklist_hash.reject { | k, v | !v.kind_of?(Hash) || v['TYPE'] != 'zypp' } + changedservices = tasklist_hash.reject { | k, v | !v.kind_of?(Hash) || v['TYPE'] != 'nu' } end @@ -173,7 +176,7 @@ class Register xml.exitcode exitcode xml.guid self.guid || '' - if @arguments + if @arguments && exitcode != 0 xml.missingarguments({:type => "array"}) do @arguments.each do | k, v | if k && v.kind_of?(Hash) @@ -191,13 +194,13 @@ class Register if changedrepos && changedrepos.size > 0 xml.changedrepos({:type => "array"}) do changedrepos.each do | k, v | - if k && v.kind_of?(Hash) && v.has_key?('task') && v['task'] != "le" && v['task'] != "ld" #only changed repos + if k && v && v.kind_of?(Hash) && v.has_key?('TASK') && v['TASK'] != "le" && v['TASK'] != "ld" #only changed repos xml.repo do - xml.name v['alias'] || '' - xml.alias v['alias'] || '' - xml.type v['type'] || '' - xml.url v['url'] || '' - xml.status tasknic[ v['task'] ] || '' + xml.name v['ALIAS'] || '' + xml.alias v['ALIAS'] || '' + xml.type v['TYPE'] || '' + xml.url v['URL'] || '' + xml.status tasknic[ v['TASK'] ] || '' end end end @@ -208,29 +211,32 @@ class Register changedservices.each do | k, v | if k && v.kind_of?(Hash) xml.service do - xml.name v['alias'] || '' - xml.alias v['alias'] || '' - xml.type v['type'] || '' - xml.url v['url'] || '' - xml.status tasknic[ v['task'] ] || '' - if v['catalogs'] + xml.name v['ALIAS'] || '' + xml.alias v['ALIAS'] || '' + xml.type v['TYPE'] || '' + xml.url v['URL'] || '' + xml.status tasknic[ v['TASK'] ] || '' + if v['CATALOGS'] xml.catalogs do - if v['catalogs'].kind_of?(Array) - v['catalogs'].each { |l| + if v['CATALOGS'].kind_of?(Hash) && v['CATALOGS']['catalog'] && v['CATALOGS']['catalog'].kind_of?(Array) && v['CATALOGS']['catalog'].size > 0 + v['CATALOGS']['catalog'].each do |l| if l && l.kind_of?(Hash) xml.catalog do - xml.name l['name'] || '' - xml.alias l['alias'] || '' - xml.status tasknic[ l['task'] ] || '' + xml.name l['NAME'] || '' + xml.alias l['ALIAS'] || '' + xml.status tasknic[ l['TASK'] ] || '' end end - } - else #It is an hash only. This is produced by hash.form_xml if catalogs contains ONE entry only + end + #It is an hash only. This is produced by hash.form_xml if catalogs contains ONE entry only + elsif v['CATALOGS'].kind_of?(Hash) && v['CATALOGS']['catalog'] && v['CATALOGS']['catalog'].kind_of?(Hash) xml.catalog do - xml.name v['catalogs']['name'] || '' - xml.alias v['catalogs']['alias'] || '' - xml.status tasknic[ v['catalogs']['task'] ] || '' + xml.name v['CATALOGS']['catalog']['NAME'] || '' + xml.alias v['CATALOGS']['catalog']['ALIAS'] || '' + xml.status tasknic[ v['CATALOGS']['catalog']['TASK'] ] || '' end + else + xml.catalog '' end end end # catalogs diff --git a/plugins/registration/package/yast2-webservice-registration.changes b/plugins/registration/package/yast2-webservice-registration.changes index b4289a5..0553e0b 100644 --- a/plugins/registration/package/yast2-webservice-registration.changes +++ b/plugins/registration/package/yast2-webservice-registration.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Nov 14 04:00:37 CET 2009 - jdsn(a)suse.de + +- adaptions for the fix of the internal server error (bnc#553244) +- version 0.0.7 + +------------------------------------------------------------------- Fri Nov 13 14:04:04 UTC 2009 - jreidinger(a)novell.com - adapt to rename of policykit granting script (bnc#554946) diff --git a/plugins/registration/package/yast2-webservice-registration.spec b/plugins/registration/package/yast2-webservice-registration.spec index 499a448..a4424d0 100644 --- a/plugins/registration/package/yast2-webservice-registration.spec +++ b/plugins/registration/package/yast2-webservice-registration.spec @@ -14,7 +14,7 @@ PreReq: yast2-webservice License: GPL v2 only Group: Productivity/Networking/Web/Utilities Autoreqprov: on -Version: 0.0.6 +Version: 0.0.7 Release: 0 Summary: YaST2 - Webservice - Registration Source: www.tar.bz2 @@ -25,10 +25,10 @@ BuildRequires: rubygem-mocha # YaST2/modules/YSR.pm %if 0%{?suse_version} == 0 || %suse_version > 1110 # 11.2 or newer -Requires: yast2-registration > 2.18.1 +Requires: yast2-registration > 2.18.2 %else # 11.1 or SLES11 -Requires: yast2-registration > 2.17.26 +Requires: yast2-registration > 2.17.27 %endif # -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> master : change registration client to behave like the other webyast modules fix summary of repo and service changes, change details button to link (bnc#555230) enable spinner during registration bnc#(554714)
by J.Daniel Schmidt 14 Nov '09

14 Nov '09

ref: refs/heads/master commit e6beb37ead307852fef380210bfb987cd54e8783 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Sat Nov 14 03:45:15 2009 +0100 change registration client to behave like the other webyast modules fix summary of repo and service changes, change details button to link (bnc#555230) enable spinner during registration bnc#(554714) --- .../app/controllers/registration_controller.rb | 96 +++++++++++++++----- .../app/views/registration/index.rhtml | 87 +++++++----------- 2 files changed, 107 insertions(+), 76 deletions(-) diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb index e1adf51..0e2ca08 100644 --- a/plugins/registration/app/controllers/registration_controller.rb +++ b/plugins/registration/app/controllers/registration_controller.rb @@ -6,6 +6,7 @@ require 'yast/service_resource' class RegistrationController < ApplicationController before_filter :login_required layout 'main' + include ProxyLoader private def client_permissions @@ -32,44 +33,57 @@ class RegistrationController < ApplicationController def index return unless client_permissions - if action_name == "detail" - @detail = true - else - @detail = false - end + @detail = action_name == "detail" unless @permissions[:statelessregister] flash[:warning] = _("No permissions for registration") redirect_to root_path return false end - register = @client.new({:arguments=>nil, - :options=>@options}) + + status = nil + @guid = nil begin - register.save - rescue ActiveResource::ClientError => e - error = Hash.from_xml(e.response.body)["registration"] - if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? - logger.debug "missing arguments #{error["missingarguments"].inspect}" - @arguments = error["missingarguments"].sort {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order - else - logger.error "error while getting arguments: #{error.inspect}" - flash[:error] = _("Arguments for registration cannot be evaluated.") - redirect_to root_path - return false + status = @client.find if @client + rescue + status = nil + end + + if status && status.respond_to?('guid') then + @guid = status.guid unless status.guid.blank? + # flash[:error] = "YES we have a GUI: #{status.guid}" + else + begin + register = @client.new( {:arguments=>nil, + :options=>@options} ) + register.save + rescue ActiveResource::ClientError => e + error = Hash.from_xml(e.response.body)["registration"] + if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? + logger.debug "missing arguments #{error["missingarguments"].inspect}" + @arguments = error["missingarguments"].sort {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order + else + logger.error "error while getting arguments: #{error.inspect}" + # keep the old message for the translation, in case we need it later + old_error_msg = _("Arguments for registration cannot be evaluated.") + flash[:error] = _("An error occurred during registration. Please try again.") + redirect_to root_path + return false + end end - end + end end def detail - index - render :action => "index" + # different action but same semantic as in update + update end # Calling the register over the service def update return unless client_permissions - @detail = false + + @detail = action_name == "detail" unless @permissions[:statelessregister] flash[:warning] = _("No permissions for registration") @@ -96,6 +110,42 @@ class RegistrationController < ApplicationController @changed_services = register.changedservices if register.respond_to? :changedservices flash[:notice] = _("Registration finished successfully.") success = true + + # inform about added services and its catalogs + if @changed_services && @changed_services.kind_of?(Array) then + flash[:notice] += "<ul>" + @changed_services.each do |c| + if c.respond_to?(:name) && c.name && c.respond_to?(:status) && c.status == 'added' then + flash[:notice] += "<li>" + _("Service added:") + " #{c.name}</li>" + end + if c.respond_to?(:catalogs) && c.catalogs && c.catalogs.respond_to?(:catalog) && c.catalogs.catalog then + if c.catalogs.catalog.respond_to?(:name) && c.catalogs.catalog.respond_to?(:status) && c.catalogs.catalog.status == 'added' then + flash[:notice] += "<ul><li>" + _("Catalog enabled:") + " #{c.catalogs.catalog.name}</li></ul>" + elsif c.catalogs.catalog.kind_of?(Array) then + flash[:notice] += "<ul>" + c.catalogs.catalog.each do |s| + if s && s.respond_to?(:name) && s.respond_to?(:status) && s.status == 'added' then + flash[:notice] += "<li>" + _("Catalog enabled:") + " #{s.name}</li>" + end + end + flash[:notice] += "</ul>" + end + end + end + flash[:notice] += "</ul>" + end + + # inform about added repositories + if @changed_repositories && @changed_repositories.kind_of?(Array) then + flash[:notice] += "<ul>" + @changed_repositories.each do |r| + if r.respond_to?(:name) && r.name && r.respond_to?(:status) && r.status == 'added' then + flash[:notice] += "<li>" + _("Repository added:") + " #{r.name}</li>" + end + end + flash[:notice] += "</ul>" + end + rescue ActiveResource::ClientError => e error = Hash.from_xml(e.response.body)["registration"] if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? @@ -136,7 +186,7 @@ class RegistrationController < ApplicationController respond_to do |format| format.html { render :action => "index" } end - end + end end end diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index fc89110..88b4985 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -2,63 +2,44 @@ <div class='plugin-content grid_12'> -<% form_tag '/registration/update' do -%> - <table summary="<%= _("This table gives registration settings.") %>"> - <tr><td colspan="2" class="full" align="center"></td></tr> + <% form_target_save = @detail ? '/registration/detail' : '/registration/update' %> + + <% if @guid then %> + <fieldset> + <%=_("This system is registered")%> + <%=_("System's GUID:")%> <%= @guid %> + <%= link_to _('Register again'), {:controller => :registration, :action =>:update}, :onclick=>"$('#progress').show()", :class => "button" %> + </fieldset> + <% + form_target_save = '/controlpanel' + end + %> + +<% form_tag form_target_save, { :onsubmit => "$('#progress').show()" } do -%> + + <% if @arguments && @arguments.size > 0 then %> + <fieldset> <% for argument in @arguments %> - <% if argument["flag"] == "m" || @detail%> - <tr> - <% if argument["error"] %> - <td><%=_(argument["name"])%></td> - <% else %> - <td><%=_(argument["name"])%></td> - <% end %> - <td><%= text_field_tag "registration_arg,"+argument["name"], argument["value"], :class=>'aligned-inputs' %></td> - </tr> + <% if argument["flag"] == "m" || @detail then %> + + <label for="<%= 'registration_arg_'+argument['name'] %>" <%= argument["error"] ? 'style="color: red"' : '' %> > + <%=_(argument["name"])%> + </label> + <%= text_field_tag "registration_arg,"+argument["name"], argument["value"] %> + <% else %> - <input type="hidden" id="<%= 'registration_arg_'+argument['name'] %>" name="<%= 'registration_arg_'+argument['name'] %>" value="<%= argument["value"] %>"/> + <%= hidden_field_tag "registration_arg,"+argument["name"], argument["value"], :disabled => 'disabled' %> <% end %> + <% end %> - <% unless @changed_repositories.blank? %> - <tr><td height=10></td></tr> - <% first=true %> - <% for repo in @changed_repositories %> - <tr> - <% if first %> - <td><%=_("Changed Repositories")%></td> - <% first=false %> - <% else %> - <td></td> - <% end %> - <td><%= repo.alias %> (<%= repo.status %>)</td> - </tr> - <% end %> - <% end %> - <% unless @changed_services.blank? %> - <tr><td height=10></td></tr> - <% first=true %> - <% for service in @changed_services %> - <tr> - <% if first %> - <td><%=_("Changed Services")%></td> - <% first=false %> - <% else %> - <td></td> - <% end %> - <td><%= service.alias %> (<%= service.status %>)</td> - </tr> - <% end %> - <% end %> - <% unless @detail || controller.action_name == "update"%> - <tr><td height=10></td></tr> - <tr> - <td></td> - <td align="right"><%= link_to _('Detail'), {:controller => :registration, :action =>:detail}, :onclick=>"$('#progress').show()", :class => "button"%></td> - </tr> - <% end %> - </table> - - <%= form_send_buttons %> + </fieldset> + <% end %> + + <% unless @detail || @guid %> + <%= link_to _('Detail'), {:controller => :registration, :action =>:detail}, :onclick=>"$('#progress').show()" %> + <% end %> + + <%= form_send_buttons %> <% end -%> </div> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <web-client> backgroud_patches_bnc550934 : change registration client to behave like the other webyast modules fix summary of repo and service changes, change details button to link (bnc#555230) enable spinner during registration bnc#(554714)
by J.Daniel Schmidt 14 Nov '09

14 Nov '09

ref: refs/heads/backgroud_patches_bnc550934 commit e6beb37ead307852fef380210bfb987cd54e8783 Author: J. Daniel Schmidt <jdsn(a)suse.de> Date: Sat Nov 14 03:45:15 2009 +0100 change registration client to behave like the other webyast modules fix summary of repo and service changes, change details button to link (bnc#555230) enable spinner during registration bnc#(554714) --- .../app/controllers/registration_controller.rb | 96 +++++++++++++++----- .../app/views/registration/index.rhtml | 87 +++++++----------- 2 files changed, 107 insertions(+), 76 deletions(-) diff --git a/plugins/registration/app/controllers/registration_controller.rb b/plugins/registration/app/controllers/registration_controller.rb index e1adf51..0e2ca08 100644 --- a/plugins/registration/app/controllers/registration_controller.rb +++ b/plugins/registration/app/controllers/registration_controller.rb @@ -6,6 +6,7 @@ require 'yast/service_resource' class RegistrationController < ApplicationController before_filter :login_required layout 'main' + include ProxyLoader private def client_permissions @@ -32,44 +33,57 @@ class RegistrationController < ApplicationController def index return unless client_permissions - if action_name == "detail" - @detail = true - else - @detail = false - end + @detail = action_name == "detail" unless @permissions[:statelessregister] flash[:warning] = _("No permissions for registration") redirect_to root_path return false end - register = @client.new({:arguments=>nil, - :options=>@options}) + + status = nil + @guid = nil begin - register.save - rescue ActiveResource::ClientError => e - error = Hash.from_xml(e.response.body)["registration"] - if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? - logger.debug "missing arguments #{error["missingarguments"].inspect}" - @arguments = error["missingarguments"].sort {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order - else - logger.error "error while getting arguments: #{error.inspect}" - flash[:error] = _("Arguments for registration cannot be evaluated.") - redirect_to root_path - return false + status = @client.find if @client + rescue + status = nil + end + + if status && status.respond_to?('guid') then + @guid = status.guid unless status.guid.blank? + # flash[:error] = "YES we have a GUI: #{status.guid}" + else + begin + register = @client.new( {:arguments=>nil, + :options=>@options} ) + register.save + rescue ActiveResource::ClientError => e + error = Hash.from_xml(e.response.body)["registration"] + if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? + logger.debug "missing arguments #{error["missingarguments"].inspect}" + @arguments = error["missingarguments"].sort {|a,b| a["name"] <=> b["name"] } #in order to show it in an unique order + else + logger.error "error while getting arguments: #{error.inspect}" + # keep the old message for the translation, in case we need it later + old_error_msg = _("Arguments for registration cannot be evaluated.") + flash[:error] = _("An error occurred during registration. Please try again.") + redirect_to root_path + return false + end end - end + end end def detail - index - render :action => "index" + # different action but same semantic as in update + update end # Calling the register over the service def update return unless client_permissions - @detail = false + + @detail = action_name == "detail" unless @permissions[:statelessregister] flash[:warning] = _("No permissions for registration") @@ -96,6 +110,42 @@ class RegistrationController < ApplicationController @changed_services = register.changedservices if register.respond_to? :changedservices flash[:notice] = _("Registration finished successfully.") success = true + + # inform about added services and its catalogs + if @changed_services && @changed_services.kind_of?(Array) then + flash[:notice] += "<ul>" + @changed_services.each do |c| + if c.respond_to?(:name) && c.name && c.respond_to?(:status) && c.status == 'added' then + flash[:notice] += "<li>" + _("Service added:") + " #{c.name}</li>" + end + if c.respond_to?(:catalogs) && c.catalogs && c.catalogs.respond_to?(:catalog) && c.catalogs.catalog then + if c.catalogs.catalog.respond_to?(:name) && c.catalogs.catalog.respond_to?(:status) && c.catalogs.catalog.status == 'added' then + flash[:notice] += "<ul><li>" + _("Catalog enabled:") + " #{c.catalogs.catalog.name}</li></ul>" + elsif c.catalogs.catalog.kind_of?(Array) then + flash[:notice] += "<ul>" + c.catalogs.catalog.each do |s| + if s && s.respond_to?(:name) && s.respond_to?(:status) && s.status == 'added' then + flash[:notice] += "<li>" + _("Catalog enabled:") + " #{s.name}</li>" + end + end + flash[:notice] += "</ul>" + end + end + end + flash[:notice] += "</ul>" + end + + # inform about added repositories + if @changed_repositories && @changed_repositories.kind_of?(Array) then + flash[:notice] += "<ul>" + @changed_repositories.each do |r| + if r.respond_to?(:name) && r.name && r.respond_to?(:status) && r.status == 'added' then + flash[:notice] += "<li>" + _("Repository added:") + " #{r.name}</li>" + end + end + flash[:notice] += "</ul>" + end + rescue ActiveResource::ClientError => e error = Hash.from_xml(e.response.body)["registration"] if error && error["status"] == "missinginfo" && !error["missingarguments"].blank? @@ -136,7 +186,7 @@ class RegistrationController < ApplicationController respond_to do |format| format.html { render :action => "index" } end - end + end end end diff --git a/plugins/registration/app/views/registration/index.rhtml b/plugins/registration/app/views/registration/index.rhtml index fc89110..88b4985 100644 --- a/plugins/registration/app/views/registration/index.rhtml +++ b/plugins/registration/app/views/registration/index.rhtml @@ -2,63 +2,44 @@ <div class='plugin-content grid_12'> -<% form_tag '/registration/update' do -%> - <table summary="<%= _("This table gives registration settings.") %>"> - <tr><td colspan="2" class="full" align="center"></td></tr> + <% form_target_save = @detail ? '/registration/detail' : '/registration/update' %> + + <% if @guid then %> + <fieldset> + <%=_("This system is registered")%> + <%=_("System's GUID:")%> <%= @guid %> + <%= link_to _('Register again'), {:controller => :registration, :action =>:update}, :onclick=>"$('#progress').show()", :class => "button" %> + </fieldset> + <% + form_target_save = '/controlpanel' + end + %> + +<% form_tag form_target_save, { :onsubmit => "$('#progress').show()" } do -%> + + <% if @arguments && @arguments.size > 0 then %> + <fieldset> <% for argument in @arguments %> - <% if argument["flag"] == "m" || @detail%> - <tr> - <% if argument["error"] %> - <td><%=_(argument["name"])%></td> - <% else %> - <td><%=_(argument["name"])%></td> - <% end %> - <td><%= text_field_tag "registration_arg,"+argument["name"], argument["value"], :class=>'aligned-inputs' %></td> - </tr> + <% if argument["flag"] == "m" || @detail then %> + + <label for="<%= 'registration_arg_'+argument['name'] %>" <%= argument["error"] ? 'style="color: red"' : '' %> > + <%=_(argument["name"])%> + </label> + <%= text_field_tag "registration_arg,"+argument["name"], argument["value"] %> + <% else %> - <input type="hidden" id="<%= 'registration_arg_'+argument['name'] %>" name="<%= 'registration_arg_'+argument['name'] %>" value="<%= argument["value"] %>"/> + <%= hidden_field_tag "registration_arg,"+argument["name"], argument["value"], :disabled => 'disabled' %> <% end %> + <% end %> - <% unless @changed_repositories.blank? %> - <tr><td height=10></td></tr> - <% first=true %> - <% for repo in @changed_repositories %> - <tr> - <% if first %> - <td><%=_("Changed Repositories")%></td> - <% first=false %> - <% else %> - <td></td> - <% end %> - <td><%= repo.alias %> (<%= repo.status %>)</td> - </tr> - <% end %> - <% end %> - <% unless @changed_services.blank? %> - <tr><td height=10></td></tr> - <% first=true %> - <% for service in @changed_services %> - <tr> - <% if first %> - <td><%=_("Changed Services")%></td> - <% first=false %> - <% else %> - <td></td> - <% end %> - <td><%= service.alias %> (<%= service.status %>)</td> - </tr> - <% end %> - <% end %> - <% unless @detail || controller.action_name == "update"%> - <tr><td height=10></td></tr> - <tr> - <td></td> - <td align="right"><%= link_to _('Detail'), {:controller => :registration, :action =>:detail}, :onclick=>"$('#progress').show()", :class => "button"%></td> - </tr> - <% end %> - </table> - - <%= form_send_buttons %> + </fieldset> + <% end %> + + <% unless @detail || @guid %> + <%= link_to _('Detail'), {:controller => :registration, :action =>:detail}, :onclick=>"$('#progress').show()" %> + <% end %> + + <%= form_send_buttons %> <% end -%> </div> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : fix default registration context, cleanup show templates
by J.Daniel Schmidt 14 Nov '09

14 Nov '09

ref: refs/heads/master commit ab0b5faedefc16ca3523c2d4ed496b41741d17f3 Author: J. Daniel Schmidt <jdsn(a)suse.de> 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0