Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r9357467901bacb28df24a695ec35e99434ebbea9 -rf7f4808672a3ca66927a662a165bbe66ab5608f4 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java =================================================================== diff -u -r078ffcc5cce6214e179857ace04486fa04a7e3a2 -rf7f4808672a3ca66927a662a165bbe66ab5608f4 --- lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision 078ffcc5cce6214e179857ace04486fa04a7e3a2) +++ lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java (.../LearningDesignRepositoryServlet.java) (revision f7f4808672a3ca66927a662a165bbe66ab5608f4) @@ -356,9 +356,6 @@ sortDate == null ? null : (sortDate.equals("0") ? "DESC" : "ASC")); } - LearningDesignRepositoryServlet.log - .debug("LearningDesignRepositoryServlet returning " + folderContentsJSON); - response.setContentType("application/json;charset=UTF-8"); response.getWriter().write(folderContentsJSON); @@ -375,8 +372,6 @@ FolderContentDTO.DESIGN, userId); Hashtable table = (Hashtable) WDDXProcessor.deserialize(wddxResponse); - LearningDesignRepositoryServlet.log.debug("Delete response " + wddxResponse); - Double messageTypeDouble = (Double) table.get("messageType"); int messageType = messageTypeDouble != null ? messageTypeDouble.intValue() : 0; if (messageType == FlashMessage.OBJECT_MESSAGE) { Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java =================================================================== diff -u -r26b52cfb94f532a22ad472ac2def2fcc97b1380e -rf7f4808672a3ca66927a662a165bbe66ab5608f4 --- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision 26b52cfb94f532a22ad472ac2def2fcc97b1380e) +++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java (.../WorkspaceManagementService.java) (revision f7f4808672a3ca66927a662a165bbe66ab5608f4) @@ -98,6 +98,11 @@ protected IUserManagementService userMgmtService; protected MessageService messageService; + // To support integrations that need a type for the learning design, any designs that do not have a type field set, + // return "default" in the type field. Also, the integrations can search for designs that do not have a type field + // set by setting type = default. This setup is done in the FolderContentDTO. See LDEV-3523 + protected static final String DEFAULT_DESIGN_TYPE = "default"; + /** * i18n Message service * @@ -477,6 +482,8 @@ subfolderJSON.put("folderID", folderContent.getResourceID().intValue()); result.append("folders", subfolderJSON); } else if (FolderContentDTO.DESIGN.equals(contentType)) { + if ( folderContent.getDesignType() == null ) + folderContent.setDesignType(DEFAULT_DESIGN_TYPE); if ( designType == null || designType.equals(folderContent.getDesignType())) { JSONObject learningDesignJSON = new JSONObject(); learningDesignJSON.put("name", folderContent.getName()); @@ -531,7 +538,7 @@ JSONObject learningDesignJSON = new JSONObject(); learningDesignJSON.put("name", StringEscapeUtils.escapeHtml(design.getTitle())); learningDesignJSON.put("learningDesignId", design.getLearningDesignId()); - learningDesignJSON.putOpt("type", design.getDesignType()); + learningDesignJSON.putOpt("type", design.getDesignType() != null ? design.getDesignType() : DEFAULT_DESIGN_TYPE); learningDesignJSON.put("date", design.getLastModifiedDateTime()); result.put(learningDesignJSON); } Index: lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java =================================================================== diff -u -r26b52cfb94f532a22ad472ac2def2fcc97b1380e -rf7f4808672a3ca66927a662a165bbe66ab5608f4 --- lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java (.../FolderContentDTO.java) (revision 26b52cfb94f532a22ad472ac2def2fcc97b1380e) +++ lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java (.../FolderContentDTO.java) (revision f7f4808672a3ca66927a662a165bbe66ab5608f4) @@ -253,6 +253,10 @@ this.originalAuthor = originalAuthor; } + public void setDesignType(String designType) { + this.designType = designType; + } + private String formatLastModifiedDateTime(TimeZone tz) { if(this.lastModifiedDateTime != null) { java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("dd-MMM-yyyy HH:mm:ss");