Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re250eb2937a65729d87cc30e6a46b4d4fb82c13a -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e250eb2937a65729d87cc30e6a46b4d4fb82c13a) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -113,7 +113,6 @@ admin.organisation.name =Name admin.organisation.code =Code admin.organisation.description =Description -admin.organisation.locale =Locale admin.organisation.status =Status admin.can.add.user =Course Administrators can add new users admin.can.browse.user =Course Administrators can browse all users in the system Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== diff -u -rfcc5eca8a605afdc9e927366827553a7862000cd -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision fcc5eca8a605afdc9e927366827553a7862000cd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -126,11 +126,10 @@ private static final short NAME = 0; private static final short CODE = 1; private static final short DESCRIPTION = 2; - private static final short LOCALE_ID = 3; - private static final short ORGANISATION_STATE = 4; - private static final short ADMIN_ADD_NEW_USERS = 5; - private static final short ADMIN_BROWSE_ALL_USERS = 6; - private static final short ADMIN_CHANGE_STATUS = 7; + private static final short ORGANISATION_STATE = 3; + private static final short ADMIN_ADD_NEW_USERS = 4; + private static final short ADMIN_BROWSE_ALL_USERS = 5; + private static final short ADMIN_CHANGE_STATUS = 6; // class-wide variables ArrayList results = new ArrayList(); @@ -259,16 +258,6 @@ org.setCode(parseStringCell(row.getCell(ImportService.CODE))); org.setDescription(parseStringCell(row.getCell(ImportService.DESCRIPTION))); - String localeId = parseStringCell(row.getCell(ImportService.LOCALE_ID)); - SupportedLocale locale = getLocale(localeId); - if (locale == null) { - args[0] = "(" + localeId + ")"; - rowResult.add(messageService.getMessage("error.locale.invalid", args)); - hasError = true; - } else { - org.setLocale(locale); - } - String orgStateText = parseStringCell(row.getCell(ImportService.ORGANISATION_STATE)); OrganisationState orgState = getOrganisationState(orgStateText); org.setOrganisationState(orgState); Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java =================================================================== diff -u -rfcc5eca8a605afdc9e927366827553a7862000cd -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java (.../OrgSaveAction.java) (revision fcc5eca8a605afdc9e927366827553a7862000cd) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java (.../OrgSaveAction.java) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -153,9 +153,7 @@ (Organisation) service.findById(Organisation.class, (Integer) orgForm.get("parentId"))); org.setOrganisationType( (OrganisationType) service.findById(OrganisationType.class, (Integer) orgForm.get("typeId"))); - writeAuditLog(user, org, orgForm, org.getOrganisationState(), org.getLocale()); } - org.setLocale(locale); org.setOrganisationState(state); if (log.isDebugEnabled()) { log.debug("orgId: " + org.getOrganisationId() + " create date: " + org.getCreateDate()); @@ -242,25 +240,6 @@ logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null, null, null, null, message); } - /* - * this field not set yet - * if(!org.getCourseAdminCanCreateGuestAccounts().equals((Boolean)orgForm.get( - * "courseAdminCanCreateGuestAccounts"))) { - * args[0] = "courseAdminCanCreateGuestAccounts"; - * args[2] = org.getCourseAdminCanCreateGuestAccounts() ? "true" : "false"; - * args[3] = (Boolean)orgForm.get("courseAdminCanCreateGuestAccounts") ? "true" : "false"; - * message = messageService.getMessage(key, args); - * auditService.log(AdminConstants.MODULE_NAME, message); - * } - */ - if (!org.getLocale().getLocaleId().equals(orgForm.get("localeId"))) { - args[0] = "locale"; - args[2] = org.getLocale().getDescription(); - args[3] = newLocale.getDescription(); - message = messageService.getMessage(key, args); - logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, user != null ? user.getUserID() : null, - null, null, null, message); - } } else { String[] args = new String[2]; args[0] = org.getName() + "(" + org.getOrganisationId() + ")"; Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java =================================================================== diff -u -r385b5d293d69ff33476eb85ef52350179d5a4488 -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java (.../OrganisationAction.java) (revision 385b5d293d69ff33476eb85ef52350179d5a4488) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java (.../OrganisationAction.java) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.admin.web.action; import java.io.IOException; -import java.util.Collections; import java.util.List; import java.util.Set; @@ -44,7 +43,6 @@ import org.lamsfoundation.lams.usermanagement.OrganisationState; import org.lamsfoundation.lams.usermanagement.OrganisationType; import org.lamsfoundation.lams.usermanagement.Role; -import org.lamsfoundation.lams.usermanagement.SupportedLocale; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; @@ -60,14 +58,13 @@ private static IUserManagementService service; private static MessageService messageService; - private static List locales; private static List status; @SuppressWarnings("unchecked") public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { OrganisationAction.service = AdminServiceProxy.getService(getServlet().getServletContext()); - initLocalesAndStatus(); + initStatus(); DynaActionForm orgForm = (DynaActionForm) form; Integer orgId = WebUtil.readIntParam(request, "orgId", true); @@ -87,8 +84,6 @@ orgForm.set("parentName", org.getParentOrganisation().getName()); orgForm.set("typeId", org.getOrganisationType().getOrganisationTypeId()); orgForm.set("stateId", org.getOrganisationState().getOrganisationStateId()); - SupportedLocale locale = org.getLocale(); - orgForm.set("localeId", locale != null ? locale.getLocaleId() : null); // find a course or subcourse with any lessons, so we warn user when he tries to delete the course Integer courseToDeleteLessons = org.getLessons().size() > 0 ? orgId : null; @@ -102,7 +97,6 @@ } request.setAttribute("courseToDeleteLessons", courseToDeleteLessons); } - request.getSession().setAttribute("locales", OrganisationAction.locales); request.getSession().setAttribute("status", OrganisationAction.status); if (OrganisationAction.service.isUserSysAdmin() || OrganisationAction.service.isUserGlobalGroupAdmin()) { @@ -120,7 +114,7 @@ public ActionForward create(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { OrganisationAction.service = AdminServiceProxy.getService(getServlet().getServletContext()); - initLocalesAndStatus(); + initStatus(); DynaActionForm orgForm = (DynaActionForm) form; if (!(request.isUserInRole(Role.SYSADMIN) || OrganisationAction.service.isUserGlobalGroupAdmin())) { @@ -138,7 +132,6 @@ Organisation parentOrg = (Organisation) OrganisationAction.service.findById(Organisation.class, parentId); orgForm.set("parentName", parentOrg.getName()); } - request.getSession().setAttribute("locales", OrganisationAction.locales); request.getSession().setAttribute("status", OrganisationAction.status); return mapping.findForward("organisation"); } @@ -226,12 +219,9 @@ } @SuppressWarnings("unchecked") - private void initLocalesAndStatus() { - if ((OrganisationAction.locales == null) - || ((OrganisationAction.status == null) && (OrganisationAction.service != null))) { - OrganisationAction.locales = OrganisationAction.service.findAll(SupportedLocale.class); + private void initStatus() { + if (OrganisationAction.status == null && OrganisationAction.service != null) { OrganisationAction.status = OrganisationAction.service.findAll(OrganisationState.class); - Collections.sort(OrganisationAction.locales); } } } \ No newline at end of file Index: lams_admin/web/WEB-INF/struts-config.xml =================================================================== diff -u -rb6966cf593629d21ffbdd8d866e7f7b47a3aba6b -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision b6966cf593629d21ffbdd8d866e7f7b47a3aba6b) +++ lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -37,7 +37,6 @@ - Index: lams_admin/web/organisation/courseAdminEdit.jsp =================================================================== diff -u -rf7cb84defcd7ff6e4f3232f2ef1856f1311215d9 -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/web/organisation/courseAdminEdit.jsp (.../courseAdminEdit.jsp) (revision f7cb84defcd7ff6e4f3232f2ef1856f1311215d9) +++ lams_admin/web/organisation/courseAdminEdit.jsp (.../courseAdminEdit.jsp) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -35,18 +35,6 @@ : - - : - - - - - - - - - - : Index: lams_admin/web/organisation/createOrEdit.jsp =================================================================== diff -u -r385b5d293d69ff33476eb85ef52350179d5a4488 -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 385b5d293d69ff33476eb85ef52350179d5a4488) +++ lams_admin/web/organisation/createOrEdit.jsp (.../createOrEdit.jsp) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -74,18 +74,6 @@ - - - - - - - - - - - - Index: lams_admin/web/organisation/list.jsp =================================================================== diff -u -r3d33562d7f338c30df5e82d252fe9ab24740e44f -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 3d33562d7f338c30df5e82d252fe9ab24740e44f) +++ lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -181,10 +181,6 @@ - : - - - : @@ -271,10 +267,6 @@ - : - - - : Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -re1113de85399c335bb2d6b6ed37d085f14cb5934 -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f Binary files differ Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml =================================================================== diff -u -ree2713a23c1a795eec5f782795da09918cbdf006 -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (.../Organisation.hbm.xml) (revision ee2713a23c1a795eec5f782795da09918cbdf006) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml (.../Organisation.hbm.xml) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -240,17 +240,6 @@ - - - - @hibernate.many-to-one not-null="true" - @hibernate.column - name="locale_id" - - - Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180707.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180707.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180707.sql (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4616 Remove obsolete column +ALTER TABLE lams_organisation DROP FOREIGN KEY FK_lams_organisation_5, + DROP COLUMN locale_id; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -rb959a5f41013249a0537fb19bb7129dd727bb55a -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision b959a5f41013249a0537fb19bb7129dd727bb55a) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -371,7 +371,6 @@ org.setDescription(extCourseId); org.setOrganisationState( (OrganisationState) service.findById(OrganisationState.class, OrganisationState.ACTIVE)); - org.setLocale(LanguageUtil.getSupportedLocale(langIsoCode, countryIsoCode)); org.setEnableCourseNotifications(true); @@ -435,7 +434,7 @@ + "Email format is invalid. External server:" + extServer.getServerid() + ", Username:" + login + ", firstName:" + firstName + ", lastName:" + lastName); } - + //set user's country to default value if it wasn't provided or has a wrong value String country = userData[7]; if (StringUtils.isBlank(country) || !Arrays.asList(CommonConstants.COUNTRY_CODES).contains(country)) { @@ -526,7 +525,7 @@ throw new UserInfoFetchException(e); } } - + @Override public boolean isIntegrationUser(Integer userId) { Map properties = new HashMap<>(); Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java =================================================================== diff -u -rda40d9c086f1468573f26d34056b6a1bf6268730 -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision da40d9c086f1468573f26d34056b6a1bf6268730) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java (.../Organisation.java) (revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f) @@ -73,8 +73,6 @@ private OrganisationState organisationState; - private SupportedLocale locale; - /** persistent field */ private Boolean courseAdminCanAddNewUsers; @@ -309,14 +307,6 @@ return new OrganisationDTO(this); } - public SupportedLocale getLocale() { - return locale; - } - - public void setLocale(SupportedLocale locale) { - this.locale = locale; - } - @Override public int compareTo(Object o) { return name.compareToIgnoreCase(((Organisation) o).getName());