Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== diff -u -r7998a31f6d7d4f1eef3e866bafef22caa012eb7a -re855c31deab8631c4e5ee268d3f4281ced439ad5 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 7998a31f6d7d4f1eef3e866bafef22caa012eb7a) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision e855c31deab8631c4e5ee268d3f4281ced439ad5) @@ -699,6 +699,7 @@ user.setFax(parseStringCell(row.getCell(FAX))); user.setDisabledFlag(false); user.setCreateDate(new Date()); + user.setTimeZone(user.getTimeZone()); user.setTutorialsDisabled(false); user.setFirstLogin(true); Index: lams_common/db/sql/insert_lams_users.sql =================================================================== diff -u -r06be19e416acd49df38de4b1e3c99b84a6c3f97e -re855c31deab8631c4e5ee268d3f4281ced439ad5 --- lams_common/db/sql/insert_lams_users.sql (.../insert_lams_users.sql) (revision 06be19e416acd49df38de4b1e3c99b84a6c3f97e) +++ lams_common/db/sql/insert_lams_users.sql (.../insert_lams_users.sql) (revision e855c31deab8631c4e5ee268d3f4281ced439ad5) @@ -97,84 +97,84 @@ INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone,fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id) +locale_id, flash_theme_id, html_theme_id, timezone) VALUES(1, 'sysadmin',SHA1('sysadmin'),'The','System','Administrator',null,null,null, 'Sydney','NSW','Australia',null,null,null,null,'sysadmin@x.x', 0,NOW(),1,51, -1,1,2); +1,1,2,28); INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone,fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id) +locale_id, flash_theme_id, html_theme_id, timezone) VALUES(2, 'test',SHA1('test'),'Dr','Testing','LDAP',null,null,null, 'Sydney','NSW','Australia',null,null,null,null,'test@xx.xx.xx', 0,NOW(),3,null, -3,1,2); +3,1,2,28); INSERT INTO lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone,fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id) +locale_id, flash_theme_id, html_theme_id, timezone) VALUES(3, 'lamskh01',SHA1('dummy'),'Mr','Jacky','Fang',null,null,null, 'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au', 0,NOW(),2,null, -1,1,2); +1,1,2,28); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id, flash_theme_id, html_theme_id) +locale_id, flash_theme_id, html_theme_id, timezone) values (4,'mmm',SHA1('mmm'),'Ms','Mary','Morgan','99','First Ave',null, 'Parramatta','NSW','Australia','0295099999','0298939999','0499999999', '0299999999','mmmmmmm@xx.os', -0,'20041223',1,4,1,1,2); +0,'20041223',1,4,1,1,2,28); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id) +locale_id,flash_theme_id, html_theme_id, timezone) values (5,'test1',SHA1('test1'),'Dr','One','Test','1','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test1@xx.os', -0,'20041223',1,5,1,1,2); +0,'20041223',1,5,1,1,2,28); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id) +locale_id,flash_theme_id, html_theme_id, timezone) values (6,'test2',SHA1('test2'),'Dr','Two','Test','2','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test2@xx.os', -0,'20041223',1,6,1,1,2); +0,'20041223',1,6,1,1,2,28); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id) +locale_id,flash_theme_id, html_theme_id, timezone) values (7,'test3',SHA1('test3'),'Dr','Three','Test','3','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test3@xx.os', -0,'20041223',1,7,1,1,2); +0,'20041223',1,7,1,1,2,28); insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3, city,state,country,day_phone,evening_phone,mobile_phone, fax,email, disabled_flag,create_date,authentication_method_id,workspace_id, -locale_id,flash_theme_id, html_theme_id) +locale_id,flash_theme_id, html_theme_id, timezone) values (8,'test4',SHA1('test4'),'Dr','Four','Test','4','Test Ave',null, 'Nowhere','NSW','Australia','0211111111','0211111112','0411111111', '0211111113','test4@xx.os', -0,'20041223',1,8,1,1,2); +0,'20041223',1,8,1,1,2,28); --- sysadmin only belongs to root and public INSERT INTO lams_user_organisation (user_organisation_id, organisation_id, user_id) VALUES (1, 1, 1); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java =================================================================== diff -u -rf5a60355cf9b220c5a13955da3c5003f20a76d43 -re855c31deab8631c4e5ee268d3f4281ced439ad5 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java (.../LdapService.java) (revision f5a60355cf9b220c5a13955da3c5003f20a76d43) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java (.../LdapService.java) (revision e855c31deab8631c4e5ee268d3f4281ced439ad5) @@ -156,6 +156,9 @@ user.setDisabledFlag(getDisabledBoolean(attrs)); user.setCreateDate(new Date()); user.setLocale(getLocale(map.get("locale"))); + user.setTimeZone(user.getTimeZone()); + user.setTutorialsDisabled(false); + user.setFirstLogin(true); service.save(user); service.auditUserCreated(user, "common"); return true;