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.10.1 -r1.11.10.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 1 Mar 2010 04:56:25 -0000 1.11.10.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 25 Nov 2010 19:47:15 -0000 1.11.10.2 @@ -56,6 +56,8 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.LanguageUtil; import org.lamsfoundation.lams.util.MessageService; @@ -699,6 +701,7 @@ user.setFax(parseStringCell(row.getCell(FAX))); user.setDisabledFlag(false); user.setCreateDate(new Date()); + user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); return (hasError ? null : user); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/Attic/ImportV1ContentsSaveAction.java,v diff -u -r1.7 -r1.7.10.1 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java 21 Sep 2007 03:34:24 -0000 1.7 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ImportV1ContentsSaveAction.java 25 Nov 2010 19:47:15 -0000 1.7.10.1 @@ -54,6 +54,8 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.LanguageUtil; import org.lamsfoundation.lams.util.MessageService; @@ -241,6 +243,7 @@ newUser.setPassword(HashUtil.sha1(user.getLogin())); newUser.setChangePassword(true); + newUser.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); newUser.setFlashTheme(service.getDefaultFlashTheme()); newUser.setHtmlTheme(service.getDefaultHtmlTheme()); newUser.setDisabledFlag(false); Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v diff -u -r1.18.6.1.2.3 -r1.18.6.1.2.4 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 10 Dec 2009 06:16:08 -0000 1.18.6.1.2.3 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 25 Nov 2010 19:47:21 -0000 1.18.6.1.2.4 @@ -57,6 +57,8 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.CSVUtil; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HashUtil; import org.lamsfoundation.lams.util.LanguageUtil; @@ -281,6 +283,7 @@ user.setCreateDate(new Date()); user.setDisabledFlag(false); user.setLocale(LanguageUtil.getSupportedLocale(userData[13], userData[12])); + user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); user.setFlashTheme(service.getDefaultFlashTheme()); user.setHtmlTheme(service.getDefaultHtmlTheme()); service.save(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.36.4.5.2.6 -r1.36.4.5.2.7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 1 Apr 2010 20:13:48 -0000 1.36.4.5.2.6 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 25 Nov 2010 19:47:22 -0000 1.36.4.5.2.7 @@ -165,77 +165,12 @@ /** persistent field - for Pedagogical Planner */ private Set recentlyModifiedLearningDesigns = new LinkedHashSet(); - - /** full constructor */ - public User(String login, String password, String title, String firstName, String lastName, String addressLine1, - String addressLine2, String addressLine3, String city, String state, String postcode, String country, - String dayPhone, String eveningPhone, String mobilePhone, String fax, String email, Boolean disabledFlag, - Date createDate, Workspace workspace, AuthenticationMethod authenticationMethod, - Theme flashTheme, Theme htmlTheme, Set userOrganisations, String chatId, - Set learnerProgresses, Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons, - Long portraitUuid, Boolean changePassword, Boolean enableFlash, String lamsCommunityToken) { - this.login = login; - this.password = password; - this.title = title; - this.firstName = firstName; - this.lastName = lastName; - this.addressLine1 = addressLine1; - this.addressLine2 = addressLine2; - this.addressLine3 = addressLine3; - this.city = city; - this.state = state; - this.postcode = postcode; - this.country = country; - this.dayPhone = dayPhone; - this.eveningPhone = eveningPhone; - this.mobilePhone = mobilePhone; - this.fax = fax; - this.email = email; - this.disabledFlag = disabledFlag; - this.createDate = createDate; - this.workspace = workspace; - this.authenticationMethod = authenticationMethod; - this.flashTheme = flashTheme; - this.htmlTheme = htmlTheme; - this.chatId = chatId; - this.userOrganisations = userOrganisations; - this.learnerProgresses = learnerProgresses; - this.userToolSessions = userToolSessions; - this.userGroups = userGroups; - this.learningDesigns = learningDesigns; - this.lessons = lessons; - this.portraitUuid = portraitUuid; - this.changePassword = changePassword; - this.enableFlash = enableFlash; - this.lamsCommunityToken = lamsCommunityToken; - } /** default constructor */ public User() { changePassword = false; - enableFlash = true; } - /** minimal constructor */ - public User(String login, String password, Boolean disabledFlag, Date createDate, Workspace workspace, - AuthenticationMethod authenticationMethod, Set userOrganisations, Set learnerProgresses, - Set userToolSessions, Set userGroups, Set learningDesigns, Set lessons) { - this.login = login; - this.password = password; - this.disabledFlag = disabledFlag; - this.createDate = createDate; - this.workspace = workspace; - this.authenticationMethod = authenticationMethod; - this.userOrganisations = userOrganisations; - this.learnerProgresses = learnerProgresses; - this.userToolSessions = userToolSessions; - this.userGroups = userGroups; - this.learningDesigns = learningDesigns; - this.lessons = lessons; - changePassword = false; - enableFlash = true; - } - /** * @hibernate.id generator-class="native" type="java.lang.Integer" column="user_id" * Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java,v diff -u -r1.17.6.2 -r1.17.6.3 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java 23 May 2010 23:11:30 -0000 1.17.6.2 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java 25 Nov 2010 19:47:22 -0000 1.17.6.3 @@ -151,6 +151,7 @@ user.setMobilePhone(map.get("mobile")); user.setAuthenticationMethod((AuthenticationMethod) service.findById(AuthenticationMethod.class, AuthenticationMethod.LDAP)); + user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); user.setFlashTheme(service.getDefaultFlashTheme()); user.setHtmlTheme(service.getDefaultHtmlTheme()); user.setDisabledFlag(getDisabledBoolean(attrs));