Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r385b5d293d69ff33476eb85ef52350179d5a4488 -rc368a79cdaf7adf21f3185b6bdccd024320982c9 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 385b5d293d69ff33476eb85ef52350179d5a4488) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c368a79cdaf7adf21f3185b6bdccd024320982c9) @@ -114,6 +114,7 @@ admin.organisation.description =Description admin.organisation.locale =Locale admin.organisation.status =Status +admin.organisation.create.date =Create date admin.can.add.user =Course Administrators can add new users admin.can.browse.user =Course Administrators can browse all users in the system admin.can.change.status =Course Administrators can change status of course Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java =================================================================== diff -u -r85ef8aca5722a36582117db1e8b988e2c16b6369 -rc368a79cdaf7adf21f3185b6bdccd024320982c9 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java (.../OrgManageAction.java) (revision 85ef8aca5722a36582117db1e8b988e2c16b6369) +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java (.../OrgManageAction.java) (revision c368a79cdaf7adf21f3185b6bdccd024320982c9) @@ -46,6 +46,7 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.usermanagement.service.UserManagementService; +import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; @@ -190,7 +191,7 @@ sortOrder = isSort3.equals(0) ? "ASC" : "DESC"; } else if (isSort4 != null) { - sortBy = "description"; + sortBy = "createDate"; sortOrder = isSort4.equals(0) ? "ASC" : "DESC"; } @@ -211,8 +212,9 @@ responseRow.put("name", StringEscapeUtils.escapeHtml(orgName)); String orgCode = organisation.getCode() == null ? "" : organisation.getCode(); responseRow.put("code", StringEscapeUtils.escapeHtml(orgCode)); - String orgDescription = organisation.getDescription() == null ? "" : organisation.getDescription(); - responseRow.put("description", StringEscapeUtils.escapeHtml(orgDescription)); + String orgCreateDate = organisation.getCreateDate() == null ? "" + : FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.format(organisation.getCreateDate()); + responseRow.put("createDate", orgCreateDate); rows.put(responseRow); } Index: lams_admin/web/organisation/list.jsp =================================================================== diff -u -r5f626596bbeb5bbbbd800be3ddf6ff7f1bdaeaa6 -rc368a79cdaf7adf21f3185b6bdccd024320982c9 --- lams_admin/web/organisation/list.jsp (.../list.jsp) (revision 5f626596bbeb5bbbbd800be3ddf6ff7f1bdaeaa6) +++ lams_admin/web/organisation/list.jsp (.../list.jsp) (revision c368a79cdaf7adf21f3185b6bdccd024320982c9) @@ -78,7 +78,7 @@ rows += ''; rows += ''; - rows += orgData["description"]; + rows += orgData["createDate"]; rows += ''; rows += ''; @@ -298,7 +298,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -rc368a79cdaf7adf21f3185b6bdccd024320982c9 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision c33d82bf97152099b7a309a156ec2707239b622c) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision c368a79cdaf7adf21f3185b6bdccd024320982c9) @@ -139,7 +139,7 @@ sortByParam = "o.code"; break; case "description": - sortByParam = "o.description"; + sortByParam = "o.createDate"; break; }