Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rfbcc39165dcd908171cee18188e528e176693a04 -r4380bee72735f5311cf4f474a711c38fe33a8585 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fbcc39165dcd908171cee18188e528e176693a04) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4380bee72735f5311cf4f474a711c38fe33a8585) @@ -363,6 +363,7 @@ config.monitor.screen.size =Monitor Screen Size config.learner.screen.size =Learner Screen Size config.admin.screen.size =System Admin Screen Size +config.authoring.suffix =Add unique suffix when importing Learning Designs label.tool =Tool label.tool.version =Tool Version label.database.version =Database Version Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java =================================================================== diff -u -r27a9e58b46446d891cf6b081e8fb6fb6f6294e2e -r4380bee72735f5311cf4f474a711c38fe33a8585 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 27a9e58b46446d891cf6b081e8fb6fb6f6294e2e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (.../ExportToolContentService.java) (revision 4380bee72735f5311cf4f474a711c38fe33a8585) @@ -2084,11 +2084,15 @@ // then read and update the title, then save again. learningDesignDAO.insert(ld); - ld.setTitle(ImportExportUtil.generateUniqueLDTitle(folder, ld.getTitle(), learningDesignDAO)); - - learningDesignDAO.update(ld); - // persist - + + // add suffix if configuration is not set or is set to true + String addSuffix = Configuration.get(ConfigurationKeys.SUFFIX_IMPORTED_LD); + if (addSuffix == null || Boolean.valueOf(addSuffix)) { + ld.setTitle(ImportExportUtil.generateUniqueLDTitle(folder, ld.getTitle(), learningDesignDAO)); + learningDesignDAO.update(ld); + // persist + } + // Once we have the competences saved, we can save the competence mappings Set allCompetenceMappings = new HashSet(); for (AuthoringActivityDTO actDto : actDtoList) { Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -rfbcc39165dcd908171cee18188e528e176693a04 -r4380bee72735f5311cf4f474a711c38fe33a8585 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision fbcc39165dcd908171cee18188e528e176693a04) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 4380bee72735f5311cf4f474a711c38fe33a8585) @@ -280,5 +280,8 @@ // LDEV-2889 public static String LEARNER_COLLAPSIBLE_PROGRESS_PANEL = "LearnerCollapsProgressPanel"; - -} + + // CNG-26 Add to lams_configuration and set to false + // if you don't want imported LD to have __ appended + public static String SUFFIX_IMPORTED_LD = "SuffixImportedLD"; +} \ No newline at end of file