Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v diff -u -r1.31.2.13 -r1.31.2.14 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 24 Feb 2016 12:35:36 -0000 1.31.2.13 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 15 Mar 2016 18:49:15 -0000 1.31.2.14 @@ -58,6 +58,7 @@ import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; +import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.tool.ToolContentManager; @@ -719,13 +720,18 @@ if (toolContentObj == null) { throw new DataMissingException("Unable to find default content for the imageGallery tool"); } + + // don't export following fields + for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { + criteria.setToolContentId(null); + } // set ImageGalleryToolContentHandler as null to avoid copy file node in repository again. toolContentObj = ImageGallery.newInstance(toolContentObj, toolContentId); Set images = toolContentObj.getImageGalleryItems(); for (ImageGalleryItem image : images) { - //convert file extension to lower case + // convert file extension to lower case String fileName = image.getFileName(); String[] fileNameParts = fileName.split("\\."); String fileExtension = fileNameParts[fileNameParts.length - 1]; @@ -782,6 +788,9 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); + for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { + criteria.setToolContentId(toolContentId); + } ImageGalleryUser user = imageGalleryUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), toolContentId); if (user == null) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.111.2.20 -r1.111.2.21 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 24 Feb 2016 12:35:25 -0000 1.111.2.20 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 15 Mar 2016 18:49:17 -0000 1.111.2.21 @@ -52,6 +52,7 @@ import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; +import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.rest.RestTags; @@ -655,6 +656,9 @@ for (QaQueContent question : questions) { question.setQaContent(null); } + for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { + criteria.setToolContentId(null); + } exportContentService.exportToolContent(toolContentID, toolContentObj, qaToolContentHandler, rootPath); } catch (ExportToolContentException e) { @@ -680,7 +684,10 @@ // reset it to new toolContentID toolContentObj.setQaContentId(toolContentID); toolContentObj.setCreatedBy(newUserUid); - + for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { + criteria.setToolContentId(toolContentID); + } + // set back the tool content Set questions = toolContentObj.getQaQueContents(); for (QaQueContent question : questions) { Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java,v diff -u -r1.7.2.4 -r1.7.2.5 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 9 Mar 2016 01:56:45 -0000 1.7.2.4 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 15 Mar 2016 18:49:18 -0000 1.7.2.5 @@ -397,6 +397,11 @@ if (toolContentObj == null) { throw new DataMissingException("Unable to find default content for the peerreview tool"); } + + // don't export following fields + for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) { + criteria.setToolContentId(null); + } // set PeerreviewToolContentHandler as null to avoid copy file node in repository again. toolContentObj = Peerreview.newInstance(toolContentObj, toolContentId);