Index: lams_admin/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v
diff -u -r1.32 -r1.33
--- lams_admin/conf/xdoclet/struts-forms.xml 1 Jul 2009 02:39:08 -0000 1.32
+++ lams_admin/conf/xdoclet/struts-forms.xml 20 Aug 2009 03:02:53 -0000 1.33
@@ -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.11 -r1.12
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 9 Jan 2008 04:19:53 -0000 1.11
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 20 Aug 2009 03:02:53 -0000 1.12
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v
diff -u -r1.41 -r1.42
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 8 Jul 2009 06:55:10 -0000 1.41
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 20 Aug 2009 03:02:51 -0000 1.42
@@ -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() {