Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
diff -u -r6ea112b9b57636ff8cf428beaf3e91df321aa0d9 -r31eb55cb5effb59ca9909c2dd842ac4ebc03a223
--- lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 6ea112b9b57636ff8cf428beaf3e91df321aa0d9)
+++ lams_admin/conf/xdoclet/struts-forms.xml (.../struts-forms.xml) (revision 31eb55cb5effb59ca9909c2dd842ac4ebc03a223)
@@ -44,6 +44,7 @@
+
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r818789ecaa116af830c725ee4a3b0b1d9f9b495c -r31eb55cb5effb59ca9909c2dd842ac4ebc03a223
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 818789ecaa116af830c725ee4a3b0b1d9f9b495c)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 31eb55cb5effb59ca9909c2dd842ac4ebc03a223)
@@ -699,6 +699,7 @@
user.setFax(parseStringCell(row.getCell(FAX)));
user.setDisabledFlag(false);
user.setCreateDate(new Date());
+ user.setFirstLogin(true);
return (hasError ? null : user);
}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -racf8b8aad096f0fdc9b5beada47f7cb646b59aca -r31eb55cb5effb59ca9909c2dd842ac4ebc03a223
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision acf8b8aad096f0fdc9b5beada47f7cb646b59aca)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 31eb55cb5effb59ca9909c2dd842ac4ebc03a223)
@@ -691,7 +691,9 @@
new CSSThemeBriefDTO(flashTheme), new CSSThemeBriefDTO(htmlTheme),
// TimeZone.getTimeZone("Australia/Sydney"),
tz, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, enableFlash,
- lamsCommunityToken, lamsCommunityUsername, tutorialsDisabled, tutorialPages, firstLogin);
+ lamsCommunityToken, lamsCommunityUsername, tutorialsDisabled, tutorialPages,
+ (firstLogin == null ? true : false) // assume no firstLogin value means they haven't logged in
+ );
}
public UserFlashDTO getUserFlashDTO() {