Author: rhafer
Date: Fri Aug 8 17:24:02 2008
New Revision: 49887
URL: http://svn.opensuse.org/viewcvs/yast?rev=49887&view=rev
Log:
re-use the LdapDatabase-Widgets in Proposal
Modified:
trunk/ldap-server/src/LdapDatabase.ycp
trunk/ldap-server/src/LdapServer.pm
trunk/ldap-server/src/dialogs.ycp
Modified: trunk/ldap-server/src/LdapDatabase.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=49887&r1=49886&r2=49887&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapDatabase.ycp (original)
+++ trunk/ldap-server/src/LdapDatabase.ycp Fri Aug 8 17:24:02 2008
@@ -10,15 +10,20 @@
module "Database";
- map baseDb = $[];
+ map baseDb = $[];
boolean createDbDir = false;
- define symbol AddDbBasic()
+ global define symbol AddDbBasic( boolean createDefaults )
{
boolean user_changed_dbdir = false;
- list dblist = LdapServer::ReadDatabaseList();
- integer numDbs = size(dblist)-2; // don't count frontend and Config DB
+ map db = $[];
+ integer numDbs = 0;
+ if ( ! createDefaults )
+ {
+ list dblist = LdapServer::ReadDatabaseList();
+ numDbs = size(dblist)-2; // don't count frontend and Config DB
+ }
string caption = _("New Database");
string enctype = "SSHA";
list enc_types = [
@@ -81,6 +86,28 @@
);
Wizard::SetContentsButtons(caption, addDbWidget, "",
Label::BackButton(), Label::NextButton());
+ if ( createDefaults )
+ {
+ db = LdapServer::CreateInitialDefaults();
+ boolean append_checked = true;
+
+ if( db["rootdn"]:"" != "" )
+ {
+ integer pos = search( db["rootdn"]:"", db["suffix"]:"" );
+ if( pos > -1 )
+ {
+ db["rootdn"] = substring( db["rootdn"]:"", 0, pos-1 );
+ } else
+ {
+ append_checked = false;
+ }
+ }
+ UI::ChangeWidget(`id( `te_basedn), `Value, db["suffix"]:"" );
+ UI::ChangeWidget(`id( `te_rootdn), `Value, db["rootdn"]:"" );
+ UI::ChangeWidget(`id( `cb_append_basedn), `Value, append_checked );
+ UI::ChangeWidget(`id( `te_directory), `Value, db["directory"]:"" );
+ UI::ChangeWidget(`id( `cb_cryptmethod), `Value, db["pwenctype"]:"" );
+ }
symbol ret = `next;
while(true) {
ret = (symbol)UI::UserInput();
@@ -129,19 +156,22 @@
continue;
}
- list