From e32f1e9bd94250771b6e1dca7dc50af0218f72fa Mon Sep 17 00:00:00 2001 From: Vanina Maletta Date: Fri, 31 Aug 2018 11:22:08 -0300 Subject: [PATCH 1/2] Change code to get the message from backend and avoid refreshing the UI when has an error Issue: BMS-4618 Reviewer: Nahuel --- .../tree/StudyTreeDragAndDropHandler.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java b/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java index 1b826e6dd8..e98290414d 100644 --- a/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java +++ b/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java @@ -72,25 +72,25 @@ protected boolean setParent(final Object sourceItemId, final Object targetItemId try { if (targetId != null && sourceId != null) { this.studyDataManager.moveDmsProject(sourceId.intValue(), targetId.intValue(), isStudy); + // apply to UI + if (targetItemId == null || this.targetTree.getItem(targetItemId) == null) { + this.targetTree.setChildrenAllowed(sourceItemId, true); + this.targetTree.setParent(sourceItemId, StudyTree.STUDY_ROOT_NODE); + this.targetTree.expandItem(StudyTree.STUDY_ROOT_NODE); + } else { + this.targetTree.setChildrenAllowed(targetItemId, true); + this.targetTree.setParent(sourceItemId, targetItemId); + this.targetTree.expandItem(targetItemId); + } + this.targetTree.select(sourceItemId); + return true; } } catch (final MiddlewareQueryException e) { StudyTreeDragAndDropHandler.LOG.error("Error with moving node to target folder.", e); MessageNotifier.showError(this.targetTree.getWindow(), this.messageSource.getMessage(Message.ERROR_INTERNAL), - this.messageSource.getMessage(Message.ERROR_REPORT_TO)); - } - - // apply to UI - if (targetItemId == null || this.targetTree.getItem(targetItemId) == null) { - this.targetTree.setChildrenAllowed(sourceItemId, true); - this.targetTree.setParent(sourceItemId, StudyTree.STUDY_ROOT_NODE); - this.targetTree.expandItem(StudyTree.STUDY_ROOT_NODE); - } else { - this.targetTree.setChildrenAllowed(targetItemId, true); - this.targetTree.setParent(sourceItemId, targetItemId); - this.targetTree.expandItem(targetItemId); + e.getMessage()); } - this.targetTree.select(sourceItemId); - return true; + return false; } public void setupTreeDragAndDropHandler() { From 0e545014e6d0e781472d70d8e8551fc0d0c3c6e8 Mon Sep 17 00:00:00 2001 From: vanina Date: Mon, 3 Sep 2018 09:56:13 -0300 Subject: [PATCH 2/2] Fix error message Issue: BMS-4618 Reviewer: Clary --- .../ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java b/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java index e98290414d..6ec7348603 100644 --- a/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java +++ b/src/main/java/org/generationcp/ibpworkbench/study/tree/StudyTreeDragAndDropHandler.java @@ -87,7 +87,7 @@ protected boolean setParent(final Object sourceItemId, final Object targetItemId } } catch (final MiddlewareQueryException e) { StudyTreeDragAndDropHandler.LOG.error("Error with moving node to target folder.", e); - MessageNotifier.showError(this.targetTree.getWindow(), this.messageSource.getMessage(Message.ERROR_INTERNAL), + MessageNotifier.showError(this.targetTree.getWindow(), this.messageSource.getMessage(Message.ERROR), e.getMessage()); } return false;