Author: rhafer Date: Fri Jun 27 15:56:45 2008 New Revision: 48591 URL: http://svn.opensuse.org/viewcvs/yast?rev=48591&view=rev Log: Don't use md5 sum to create item names Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=48591&r1=48590&r2=48591&view=diff ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Fri Jun 27 15:56:45 2008 @@ -88,6 +88,7 @@ boolean callHandler( string item, string handler ) { + y2milestone("callhandler %1 for item %2", handler, item ); if( haskey( widget_map[item]:$[], handler ) ) { any function = widget_map[item,handler]:nil; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.ycp?rev=48591&r1=48590&r2=48591&view=diff ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:56:45 2008 @@ -42,7 +42,7 @@ */ define string current_tree_item = ""; -define void addDatabaseWidgetMap( string suffix, boolean new_db ); +define void addDatabaseWidgetMap( string suffix, string item_map, boolean new_db ); /********************************* ** callback handlers ** @@ -350,7 +350,7 @@ // // if( use_common_ca // || haskey( importPaths, "ServerCertificateFile" ) -// || ( tlsSettings["TLSCertificateFile"]:nil != nil && tlsSettings["TLSCertificateKeyFile"]:nil != nil ) +// || ( tlsSettings["TLSCertificateFile"]:nil != nil && tlsSettings["TLSCertificateKeyFile"]:nil != nil ) // ) // { // UI::ChangeWidget( `rb_yes, `Value, true ); @@ -1041,7 +1041,7 @@ * tree generation functions ** *****************************************/ -void addDatabaseWidgetMap( string suffix, boolean new_db ) +void addDatabaseWidgetMap( string suffix, string item_name, boolean new_db ) { if( haskey( widget_map, suffix ) ) return; @@ -1056,11 +1056,9 @@ "cb_write" : ``( cb_write_db() ), "cb_input" : ``( cb_input_db() ) ]; - y2debug( "adding database item '%1'", suffix ); - y2debug( "adding crypted database item '%1'", cryptmd5(suffix) ); - string crypted_suffix = cryptmd5( suffix ); - widget_map[crypted_suffix] = item_map; - widget_map["databases","children"] = add( widget_map["databases","children"]:[], crypted_suffix ); + y2milestone( "adding database item '%1' as '%2'", suffix, item_name ); + widget_map[item_name] = item_map; + widget_map["databases","children"] = add( widget_map["databases","children"]:[], item_name ); } void generateDynamicTreeItems() @@ -1070,9 +1068,12 @@ y2milestone( "calling databases read handler" ); list<map<string,string> > dblist = LdapServer::GetDatabaseList(); + integer i = 0; foreach( map<string,string> db, dblist, { string tmp = sformat("%1 (%2)", db["suffix"]:"", db["type"]:"" ); - addDatabaseWidgetMap( tmp , false ); + string name = "database-" + tostring(i); + addDatabaseWidgetMap( tmp , name, false ); + i = i+1; } ); y2debug( "databases map is '%1'", (map<string,any>)widget_map["databases"]:$[] ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org