Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.33 -r1.34
--- lams_admin/conf/xdoclet/struts-forms.xml 20 Aug 2009 03:02:53 -0000 1.33
+++ lams_admin/conf/xdoclet/struts-forms.xml 20 Aug 2009 04:20:59 -0000 1.34
@@ -44,6 +44,7 @@
+
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java,v
diff -u -r1.12 -r1.13
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 20 Aug 2009 03:02:53 -0000 1.12
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 20 Aug 2009 04:20:59 -0000 1.13
@@ -699,6 +699,7 @@
user.setFax(parseStringCell(row.getCell(FAX)));
user.setDisabledFlag(false);
user.setCreateDate(new Date());
+ user.setTutorialsDisabled(false);
user.setFirstLogin(true);
return (hasError ? null : user);
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.42 -r1.43
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 20 Aug 2009 03:02:51 -0000 1.42
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 20 Aug 2009 04:20:57 -0000 1.43
@@ -691,7 +691,9 @@
new CSSThemeBriefDTO(flashTheme), new CSSThemeBriefDTO(htmlTheme),
// TimeZone.getTimeZone("Australia/Sydney"),
tz, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, enableFlash,
- lamsCommunityToken, lamsCommunityUsername, tutorialsDisabled, tutorialPages,
+ lamsCommunityToken, lamsCommunityUsername,
+ (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not set
+ tutorialPages,
(firstLogin == null ? true : false) // assume no firstLogin value means they haven't logged in
);
}