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.20.2.6 -r1.20.2.7 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 23 Nov 2016 19:21:03 -0000 1.20.2.6 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 29 Nov 2016 10:22:57 -0000 1.20.2.7 @@ -338,7 +338,7 @@ continue; } else { try { - service.save(user); + service.saveUser(user); successful++; writeAuditLog(user, userDTO); ImportService.log.debug("Row " + i + " saved user: " + user.getLogin()); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v diff -u -r1.52.2.5 -r1.52.2.6 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 22 Nov 2016 08:25:25 -0000 1.52.2.5 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 29 Nov 2016 10:22:57 -0000 1.52.2.6 @@ -380,7 +380,7 @@ UserAction.log.debug("enabling user: " + userId); user.setDisabledFlag(false); - service.save(user); + service.saveUser(user); return mapping.findForward("disabledlist"); } Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java,v diff -u -r1.39.2.7 -r1.39.2.8 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 28 Nov 2016 01:15:38 -0000 1.39.2.7 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java 29 Nov 2016 10:22:57 -0000 1.39.2.8 @@ -162,7 +162,7 @@ Theme cssTheme = (Theme) UserSaveAction.service.findById(Theme.class, (Long) userForm.get("userTheme")); user.setTheme(cssTheme); - UserSaveAction.service.save(user); + UserSaveAction.service.saveUser(user); } else { // create user //password validation @@ -198,7 +198,7 @@ (Long) userForm.get("userTheme")); user.setTheme(theme); - UserSaveAction.service.save(user); + UserSaveAction.service.saveUser(user); // make 'create user' audit log entry UserSaveAction.service.auditUserCreated(user, AdminConstants.MODULE_NAME); @@ -252,7 +252,7 @@ String passwordHash = HashUtil.sha256(password, salt); user.setSalt(salt); user.setPassword(passwordHash); - UserSaveAction.service.save(user); + UserSaveAction.service.saveUser(user); return mapping.findForward("userChangePass"); } Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.101 -r1.420.2.102 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v diff -u -r1.54.2.12 -r1.54.2.13 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 7 Nov 2016 09:27:16 -0000 1.54.2.12 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 29 Nov 2016 10:23:21 -0000 1.54.2.13 @@ -86,7 +86,7 @@ request.setAttribute("firstLogin", true); User user = getUserManagementService().getUserByLogin(userDTO.getLogin()); user.setFirstLogin(false); - getUserManagementService().save(user); + getUserManagementService().saveUser(user); userDTO.setFirstLogin(false); } @@ -244,7 +244,7 @@ if (lastVisitedOrganisationId != null) { User user = userManagementService.getUserByLogin(request.getRemoteUser()); user.setLastVisitedOrganisationId(lastVisitedOrganisationId); - userManagementService.save(user); + userManagementService.saveUser(user); } return null; Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v diff -u -r1.14.2.6 -r1.14.2.7 --- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 7 Nov 2016 09:27:37 -0000 1.14.2.6 +++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java 29 Nov 2016 10:23:21 -0000 1.14.2.7 @@ -112,7 +112,7 @@ user.setSalt(salt); user.setPassword(HashUtil.sha256(password, salt)); user.setChangePassword(false); - service.save(user); + service.saveUser(user); // make 'password changed' audit log entry IAuditService auditService = (IAuditService) ctx.getBean("auditService"); Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java,v diff -u -r1.11.2.4 -r1.11.2.5 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java 24 Oct 2016 14:55:28 -0000 1.11.2.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java 29 Nov 2016 10:23:21 -0000 1.11.2.5 @@ -120,7 +120,7 @@ getCentralToolContentHandler().deleteFile(user.getPortraitUuid()); } user.setPortraitUuid(node.getUuid()); - getService().save(user); + getService().saveUser(user); return mapping.findForward("profile"); } @@ -163,7 +163,7 @@ getCentralToolContentHandler().deleteFile(user.getPortraitUuid()); } user.setPortraitUuid(node.getUuid()); - getService().save(user); + getService().saveUser(user); return null; } Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java,v diff -u -r1.18.2.6 -r1.18.2.7 --- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java 24 Oct 2016 14:55:28 -0000 1.18.2.6 +++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java 29 Nov 2016 10:23:21 -0000 1.18.2.7 @@ -141,7 +141,7 @@ } } - getService().save(requestor); + getService().saveUser(requestor); // replace UserDTO in the shared session HttpSession ss = SessionManager.getSession(); Index: lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java,v diff -u -r1.2.4.4 -r1.2.4.5 --- lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java 11 May 2016 07:07:58 -0000 1.2.4.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java 29 Nov 2016 10:23:21 -0000 1.2.4.5 @@ -73,7 +73,7 @@ User user = getService().getUserByLogin(userDTO.getLogin()); user.getPagesWithDisabledTutorials().add(pageString); - getService().save(user); + getService().saveUser(user); ss.setAttribute(AttributeNames.USER, user.getUserDTO()); @@ -99,7 +99,7 @@ User user = getService().getUserByLogin(userDTO.getLogin()); user.getPagesWithDisabledTutorials().remove(pageString); - getService().save(user); + getService().saveUser(user); ss.setAttribute(AttributeNames.USER, user.getUserDTO()); @@ -152,7 +152,7 @@ User user = getService().getUserByLogin(userDTO.getLogin()); user.setTutorialsDisabled(true); - getService().save(user); + getService().saveUser(user); ss.setAttribute(AttributeNames.USER, user.getUserDTO()); Index: lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/action/Attic/TwoFactorAuthenticationAction.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java 24 Oct 2016 14:55:28 -0000 1.1.2.2 +++ lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java 29 Nov 2016 10:23:21 -0000 1.1.2.3 @@ -61,7 +61,7 @@ String sharedSecret = key.getKey(); loggedInUser.setTwoFactorAuthenticationSecret(sharedSecret); - userManagementService.save(loggedInUser); + userManagementService.saveUser(loggedInUser); request.setAttribute("sharedSecret", sharedSecret); String QRCode = GoogleAuthenticatorQRGenerator.getOtpAuthURL(null, "LAMS account: " + loggedInUser.getLogin(), key); Index: lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java,v diff -u -r1.3.4.4 -r1.3.4.5 --- lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java 11 May 2016 07:07:59 -0000 1.3.4.4 +++ lams_central/src/java/org/lamsfoundation/lams/web/lamscommunity/LamsCommunityLoginAction.java 29 Nov 2016 10:23:21 -0000 1.3.4.5 @@ -161,7 +161,7 @@ User user = getUser(request); user.setLamsCommunityUsername(loginForm.getLcUserName()); user.setLamsCommunityToken(result[1]); - getService().save(user); + getService().saveUser(user); // then login return loginToLamsCommunity(mapping, form, request, response); Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java,v diff -u -r1.50.2.10 -r1.50.2.11 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 11 May 2016 07:07:57 -0000 1.50.2.10 +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java 29 Nov 2016 10:23:22 -0000 1.50.2.11 @@ -1669,7 +1669,7 @@ Long recentLD = iter.next(); if (recentLD.equals(learningDesignId)) { iter.remove(); - getUserManagementService().save(user); + getUserManagementService().saveUser(user); ldFound = true; break; } Index: lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java,v diff -u -r1.9.2.6 -r1.9.2.7 --- lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java 28 Sep 2016 15:13:38 -0000 1.9.2.6 +++ lams_central/src/java/org/lamsfoundation/lams/webservice/RegisterAction.java 29 Nov 2016 10:23:21 -0000 1.9.2.7 @@ -582,7 +582,7 @@ Set userOrganisations = user.getUserOrganisations(); userOrganisations.remove(userOrganisation); - userManagementService.save(user); + userManagementService.saveUser(user); // userOrganisation and UserOrganisationRoles will be deleted by Hibernate automatically. } 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.33.2.13 -r1.33.2.14 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 28 Sep 2016 15:12:46 -0000 1.33.2.13 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 29 Nov 2016 10:23:23 -0000 1.33.2.14 @@ -210,7 +210,7 @@ uo = new UserOrganisation(user, org); service.save(uo); user.addUserOrganisation(uo); - service.save(user); + service.saveUser(user); } Integer[] roles; @@ -330,7 +330,7 @@ user.setEmail(email); user.setModifiedDate(new Date()); user.setLocale(LanguageUtil.getSupportedLocale(language, country)); - service.save(user); + service.saveUser(user); return extUserUseridMap; @@ -445,7 +445,7 @@ user.setDisabledFlag(false); user.setLocale(LanguageUtil.getSupportedLocale(userData[13], userData[12])); user.setTheme(service.getDefaultTheme()); - service.save(user); + service.saveUser(user); ExtUserUseridMap extUserUseridMap = new ExtUserUseridMap(); extUserUseridMap.setExtServer(extServer); extUserUseridMap.setExtUsername(extUsername); Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java,v diff -u -r1.2.2.2 -r1.2.2.3 --- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java 5 May 2016 08:11:01 -0000 1.2.2.2 +++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java 29 Nov 2016 10:23:23 -0000 1.2.2.3 @@ -37,7 +37,7 @@ user.setAuthenticationMethod(getAuthenticationMethod(AuthenticationMethod.DB)); user.setLocale(getDefaultLocale()); user.setCreateDate(new Date()); - userManagementService.save(user); + userManagementService.saveUser(user); // add to org SignupOrganisation signup = signupDAO.getSignupOrganisation(context); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v diff -u -r1.65.2.12 -r1.65.2.13 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 27 Oct 2016 16:00:52 -0000 1.65.2.12 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java 29 Nov 2016 10:23:23 -0000 1.65.2.13 @@ -58,6 +58,8 @@ * The object to be inserted */ void save(Object object); + + User saveUser(User user); /** * Remove an object from the database. 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.22.2.4 -r1.22.2.5 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java 11 May 2016 07:07:27 -0000 1.22.2.4 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java 29 Nov 2016 10:23:23 -0000 1.22.2.5 @@ -102,7 +102,7 @@ user.setMobilePhone(map.get("mobile")); user.setLocale(getLocale(map.get("locale"))); user.setDisabledFlag(getDisabledBoolean(attrs)); - getService().save(user); + getService().saveUser(user); } // tries to match ldap attribute to a locale, otherwise returns server @@ -162,7 +162,7 @@ user.setTimeZone(user.getTimeZone()); user.setTutorialsDisabled(false); user.setFirstLogin(true); - service.save(user); + service.saveUser(user); service.auditUserCreated(user, "common"); return true; } else { Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v diff -u -r1.115.2.19 -r1.115.2.20 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 27 Oct 2016 16:00:52 -0000 1.115.2.19 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java 29 Nov 2016 10:23:23 -0000 1.115.2.20 @@ -99,7 +99,7 @@ private IUserDAO userDAO; private IUserOrganisationDAO userOrganisationDAO; - + private IFavoriteOrganisationDAO favoriteOrganisationDAO; protected MessageService messageService; @@ -112,14 +112,10 @@ @Override public void save(Object object) { - if (object instanceof User) { - User user = (User) object; - object = saveUser(user); - } baseDAO.insertOrUpdate(object); } - protected User saveUser(User user) { + public User saveUser(User user) { if (user != null) { // create user if (user.getUserId() == null) { @@ -246,30 +242,30 @@ return users; } - + @Override public List getFavoriteOrganisationsByUser(Integer userId) { return favoriteOrganisationDAO.getFavoriteOrganisationsByUser(userId); } - + @Override public boolean isOrganisationFavorite(Integer organisationId, Integer userId) { return favoriteOrganisationDAO.isOrganisationFavorite(organisationId, userId); } - + @Override public void toggleOrganisationFavorite(Integer orgId, Integer userId) { FavoriteOrganisation favoriteOrganisation = favoriteOrganisationDAO.getFavoriteOrganisation(orgId, userId); - + //create new favoriteOrganisation if it doesn't exist if (favoriteOrganisation == null) { - + User user = (User) findById(User.class, userId); Organisation organisation = (Organisation) findById(Organisation.class, orgId); favoriteOrganisation = new FavoriteOrganisation(user, organisation); save(favoriteOrganisation); - - //remove favoriteOrganisation if it existed + + //remove favoriteOrganisation if it existed } else { delete(favoriteOrganisation); } @@ -590,7 +586,7 @@ iter.remove(); } log.debug("disabling user " + user.getLogin()); - save(user); + saveUser(user); } @Override @@ -668,7 +664,7 @@ } } uo.setUserOrganisationRoles(uors); - save(user); + saveUser(user); // make sure group managers have monitor and learner in each subgroup checkGroupManager(user, org); } @@ -913,7 +909,7 @@ String searchString) { return organisationDAO.getActiveCoursesByUser(userId, isSysadmin, page, size, searchString); } - + @Override public int getCountActiveCoursesByUser(Integer userId, boolean isSysadmin, String searchString) { return organisationDAO.getCountActiveCoursesByUser(userId, isSysadmin, searchString); @@ -1029,7 +1025,7 @@ public void setUserOrganisationDAO(IUserOrganisationDAO userOrganisationDAO) { this.userOrganisationDAO = userOrganisationDAO; } - + public void setFavoriteOrganisationDAO(IFavoriteOrganisationDAO favoriteOrganisationDAO) { this.favoriteOrganisationDAO = favoriteOrganisationDAO; }