Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r7e259d31f8894bbe8aa368bd503746db01ef05d1 -r0564c1523e752ef571fba78132a42a5085e06643 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 7e259d31f8894bbe8aa368bd503746db01ef05d1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 0564c1523e752ef571fba78132a42a5085e06643) @@ -330,12 +330,16 @@ /** * Sets user's disabled flag to true, and removes their organisation memberships. - * - * @param userId */ void disableUser(Integer userId); /** + * Sets user's disabled flag to true, and removes their organisation memberships. + * Skip log for batch processing. + */ + void disableUser(Integer userId, boolean skipLog); + + /** * Set the roles for the specified user and organisation using the roleIds in rolesList. If userOrganisation exists, * will also remove roles that are not in rolesList. * Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -rd6cc136dd301517f59c05b2ba254a4538dae65aa -r0564c1523e752ef571fba78132a42a5085e06643 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision d6cc136dd301517f59c05b2ba254a4538dae65aa) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 0564c1523e752ef571fba78132a42a5085e06643) @@ -691,9 +691,17 @@ @Override public void disableUser(Integer userId) { + disableUser(userId, false); + } + + @Override + public void disableUser(Integer userId, boolean skipLog) { User user = (User) findById(User.class, userId); + if (user.getDisabledFlag()) { + return; + } user.setDisabledFlag(true); - log.debug("disabling user " + user.getLogin()); + log.info("disabling user " + user.getLogin()); saveUser(user); Set uos = user.getUserOrganisations(); @@ -705,7 +713,9 @@ iter.remove(); } - AuditLogFilter.log(AuditLogFilter.USER_DISABLE_ACTION, "user login: " + user.getLogin()); + if (!skipLog) { + AuditLogFilter.log(AuditLogFilter.USER_DISABLE_ACTION, "user login: " + user.getLogin()); + } } @Override @@ -1234,8 +1244,8 @@ modifiedPortraitInputStream.close(); is.close(); if (log.isDebugEnabled()) { - log.debug( - "Saved large portrait with uuid: " + node.getNodeId() + " and version: " + node.getVersion()); + log.debug("Saved large portrait with uuid: " + node.getNodeId() + " and version: " + + node.getVersion()); } //resize to the medium size @@ -1260,8 +1270,8 @@ modifiedPortraitInputStream.close(); is.close(); if (log.isDebugEnabled()) { - log.debug( - "Saved small portrait with uuid: " + node.getNodeId() + " and version: " + node.getVersion()); + log.debug("Saved small portrait with uuid: " + node.getNodeId() + " and version: " + + node.getVersion()); } // delete old portrait file (we only want to keep the user's current portrait) if (user.getPortraitUuid() != null) {