Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r31eb55cb5effb59ca9909c2dd842ac4ebc03a223 -r16a173502ea5c23248e95a73afd859ea77d0ac23
--- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 31eb55cb5effb59ca9909c2dd842ac4ebc03a223)
+++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 16a173502ea5c23248e95a73afd859ea77d0ac23)
@@ -44,6 +44,7 @@
+
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r31eb55cb5effb59ca9909c2dd842ac4ebc03a223 -r16a173502ea5c23248e95a73afd859ea77d0ac23
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 31eb55cb5effb59ca9909c2dd842ac4ebc03a223)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 16a173502ea5c23248e95a73afd859ea77d0ac23)
@@ -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
===================================================================
diff -u -r31eb55cb5effb59ca9909c2dd842ac4ebc03a223 -r16a173502ea5c23248e95a73afd859ea77d0ac23
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 31eb55cb5effb59ca9909c2dd842ac4ebc03a223)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 16a173502ea5c23248e95a73afd859ea77d0ac23)
@@ -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
);
}