Author: rhafer Date: Mon Dec 15 15:09:38 2008 New Revision: 54131 URL: http://svn.opensuse.org/viewcvs/yast?rev=54131&view=rev Log: Merging latest changes from HEAD Modified: branches/SuSE-Code-11-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-Branch/ldap-server/VERSION branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes branches/SuSE-Code-11-Branch/ldap-server/src/ldap-server_proposal.ycp branches/SuSE-Code-11-Branch/ldap-server/src/wizards.ycp Modified: branches/SuSE-Code-11-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-server/VERSION?rev=54131&r1=54130&r2=54131&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-Branch/ldap-server/VERSION Mon Dec 15 15:09:38 2008 @@ -1 +1 @@ -2.17.19 +2.17.20 Modified: branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes?rev=54131&r1=54130&r2=54131&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-Branch/ldap-server/package/yast2-ldap-server.changes Mon Dec 15 15:09:38 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 15 14:34:57 CET 2008 - rhafer@suse.de + +- Version 2.17.20 + * Service proposal page didn't update correctly after + disabling LDAP server (bnc#456524) + +------------------------------------------------------------------- Fri Dec 12 16:39:44 CET 2008 - rhafer@suse.de - Version 2.17.19 Modified: branches/SuSE-Code-11-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-server/src/ldap-server_proposal.ycp?rev=54131&r1=54130&r2=54131&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Code-11-Branch/ldap-server/src/ldap-server_proposal.ycp Mon Dec 15 15:09:38 2008 @@ -160,8 +160,9 @@ seq = (symbol) WFM::CallFunction("ldap-server", [.propose]); if(seq == `next) { LdapServer::WriteServiceEnabled( true ); - } else { + } else if (seq == `disable ) { LdapServer::WriteServiceEnabled( false ); + seq = `next; } // if(seq != `next) LdapServer::Import(stored); } Modified: branches/SuSE-Code-11-Branch/ldap-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/ldap-server/src/wizards.ycp?rev=54131&r1=54130&r2=54131&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/ldap-server/src/wizards.ycp (original) +++ branches/SuSE-Code-11-Branch/ldap-server/src/wizards.ycp Mon Dec 15 15:09:38 2008 @@ -71,7 +71,7 @@ "startup" : $[ `next : "database", `abort : `abort, - `finish : `abort + `finish : `disable ], "database" : $[ `next : `next, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org