Author: jdsn
Date: Wed Aug 27 11:10:30 2008
New Revision: 50394
URL: http://svn.opensuse.org/viewcvs/yast?rev=50394&view=rev
Log:
cleanup and basics for going forward
Modified:
branches/tmp/jdsn/edu-users/src/EduUsers.ycp
branches/tmp/jdsn/edu-users/src/dialogs.ycp
Modified: branches/tmp/jdsn/edu-users/src/EduUsers.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/EduUsers.ycp?rev=50394&r1=50393&r2=50394&view=diff
==============================================================================
--- branches/tmp/jdsn/edu-users/src/EduUsers.ycp (original)
+++ branches/tmp/jdsn/edu-users/src/EduUsers.ycp Wed Aug 27 11:10:30 2008
@@ -99,7 +99,23 @@
* list of terms to hold the users
*/
//global list<term> table_users = []; // `item(`id("login"), "Name", "Surname", "Login", "Age", "Password")
-global map allusers = $[];
+//global map allusers = $[];
+
+
+global map<list> User = $[ `current : [],
+ `change : [],
+ `delete : []
+ ];
+
+global map<list> Group = $[ `current : [],
+ `change : [],
+ `delete : []
+ ];
+
+global map<list> = Template $[ `current : [],
+ `change : [],
+ `delete : []
+ ];
/**
* list of terms to hold the groups
@@ -116,17 +132,26 @@
// global list<term> table_users_show = []; // `item(`id("login"), "Name", "Surname", "Login", "Age")
-global string autologin = ""; // FIXME - how did I want to use this
-
-// TODO FIXME function to return the show table dynamically - do not store twice!
-
// only these characters are allowed in template or group names
string validChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
/**
+ * Read Users from the system
+ * @return true on success
+ */
+global boolean readUsers()
+{
+ // read data via YaPI::Users
+
+
+}
+
+
+
+/**
* Read all edu-users settings
* @return true on success
*/
@@ -232,14 +257,37 @@
* get table of users
* @return table of users
*/
-global list<term> getUserItems() {
+global list<term> getUserItemList() {
return [ `item(`id(`test1), "Tux", "Linux", "tux", "Youth"),
`item(`id(`test2), "Geeko", "Green", "geeko", "Teen")
];
- // return table_users;
+
// `item(`id("login"), "Name", "Surname", "Login", "Age", "Password")
+ // TODO FIXME this is to become function to return the show table dynamically - do not store twice!
+
+
+ // $["1000" :
+ // $[ "addit_data":"",
+ // "cn":"Peter S. Nelke",
+ // "gidnumber":"100",
+ // "grouplist":$["dialout":"1", "video":"1"],
+ // "groupname":"users",
+ // "homedirectory":"/home/pissnelke",
+ // "loginshell":"/bin/bash",
+ // "type":"local",
+ // "uid":"psnelke",
+ // "uidnumber":"1000",
+ // "userpassword":nil ]
+
+ //`current `change `delete
+ //foreach( User );
+
}
+
+global term getUser
+
+
/**
* Write all edu-users settings
* @return true on success
Modified: branches/tmp/jdsn/edu-users/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/jdsn/edu-users/src/dialogs.ycp?rev=50394&r1=50393&r2=50394&view=diff
==============================================================================
--- branches/tmp/jdsn/edu-users/src/dialogs.ycp (original)
+++ branches/tmp/jdsn/edu-users/src/dialogs.ycp Wed Aug 27 11:10:30 2008
@@ -36,7 +36,7 @@
import "EduUsers";
import "Autologin";
import "Users";
-import "UsersCache";
+//import "UsersCache";
include "edu-users/helps.ycp";
@@ -110,7 +110,7 @@
string cn = (string) UI::QueryWidget(`id(`cn), `Value);
// for proposing username
string tmp_cn = cn;
- UsersCache::ResetProposing ();
+// UsersCache::ResetProposing ();
any ret = nil;
while(true) {
@@ -130,10 +130,10 @@
cn = (string) UI::QueryWidget(`id(`cn), `Value);
if (tmp_cn != cn)
{
- UsersCache::ResetProposing();
+// UsersCache::ResetProposing();
tmp_cn = cn;
}
- string username = UsersCache::ProposeUsername ( filterchars (cn, Users::ValidLognameChars() + " "));
+ string username = ""; //UsersCache::ProposeUsername ( filterchars (cn, Users::ValidLognameChars() + " "));
UI::ChangeWidget(`id(`username), `Value, username);
}
else {
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
