Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java =================================================================== diff -u -r5a2704204eda443d4fb54e97babed70b9d71ee60 -r8ee5ee8207403f72c9857580439a36ffbbf54190 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 5a2704204eda443d4fb54e97babed70b9d71ee60) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/controller/LearningController.java (.../LearningController.java) (revision 8ee5ee8207403f72c9857580439a36ffbbf54190) @@ -520,45 +520,43 @@ } igService.uploadImageGalleryItemFile(image, files[0]); - } else { - throw new ServletException("Can not access upload dir"); - } - FileUtil.deleteTmpFileUploadDir(imageForm.getTmpFileUploadId()); + FileUtil.deleteTmpFileUploadDir(imageForm.getTmpFileUploadId()); - String title = imageForm.getTitle(); - if (StringUtils.isBlank(title)) { - Long nextImageTitleNumber = imageGallery.getNextImageTitle(); - imageGallery.setNextImageTitle(nextImageTitleNumber + 1); + String title = imageForm.getTitle(); + if (StringUtils.isBlank(title)) { + Long nextImageTitleNumber = imageGallery.getNextImageTitle(); + imageGallery.setNextImageTitle(nextImageTitleNumber + 1); - title = igService.generateNextImageTitle(nextImageTitleNumber); - } - image.setTitle(title); + title = igService.generateNextImageTitle(nextImageTitleNumber); + } + image.setTitle(title); - image.setCreateBy(user); - image.setDescription(imageForm.getDescription()); - image.setCreateByAuthor(mode.isTeacher()); - image.setHide(false); + image.setCreateBy(user); + image.setDescription(imageForm.getDescription()); + image.setCreateByAuthor(mode.isTeacher()); + image.setHide(false); - // setting SequenceId - Set imageList = imageGallery.getImageGalleryItems(); - int maxSeq = 0; - for (ImageGalleryItem dbImage : imageList) { - if (dbImage.getSequenceId() > maxSeq) { - maxSeq = dbImage.getSequenceId(); + // setting SequenceId + Set imageList = imageGallery.getImageGalleryItems(); + int maxSeq = 0; + for (ImageGalleryItem dbImage : imageList) { + if (dbImage.getSequenceId() > maxSeq) { + maxSeq = dbImage.getSequenceId(); + } } - } - maxSeq++; - image.setSequenceId(maxSeq); + maxSeq++; + image.setSequenceId(maxSeq); - imageList.add(image); - igService.saveOrUpdateImageGallery(imageGallery); + imageList.add(image); + igService.saveOrUpdateImageGallery(imageGallery); - igService.saveOrUpdateImageGalleryItem(image); + igService.saveOrUpdateImageGalleryItem(image); - // notify teachers - if (mode.isLearner() && imageGallery.isNotifyTeachersOnImageSumbit()) { - igService.notifyTeachersOnImageSumbit(toolSessionId, user); + // notify teachers + if (mode.isLearner() && imageGallery.isNotifyTeachersOnImageSumbit()) { + igService.notifyTeachersOnImageSumbit(toolSessionId, user); + } } } } Index: lams_tool_mindmap/web/common/mapjs.jsp =================================================================== diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -r8ee5ee8207403f72c9857580439a36ffbbf54190 --- lams_tool_mindmap/web/common/mapjs.jsp (.../mapjs.jsp) (revision 81f928586161dd03042b6353f68c7d7b8279ccde) +++ lams_tool_mindmap/web/common/mapjs.jsp (.../mapjs.jsp) (revision 8ee5ee8207403f72c9857580439a36ffbbf54190) @@ -13,6 +13,9 @@ #background-color[disabled] { pointer-events: auto !important; } + .minicolors-swatch.minicolors-sprite.minicolors-input-swatch { + margin-left: 0.5rem; + }