Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a4430687 by tchemit at 2019-05-21T09:06:40Z Pas d'accès à l'activité de fin de veille - Closes #1281 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java ===================================== @@ -129,7 +129,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { // on selection l'activity de fin de veille et on y reste // donc on ne continue pas la fermeture de la route - throw new CloseEditNodeVetoException("Fermeture abandonnée! TODO Ajouter message plus explicite.", node); + throw new CloseEditNodeVetoException("Fermeture de la route abandonnée (création d'une activité de fin de veille en cours)", node); } } @@ -139,7 +139,7 @@ public class RouteCloseCallback implements ObserveEditNodeCloseCallback { MutableTreeNode routeNode = tree.select(node).orElseThrow(() -> new IllegalStateException("Can't find route node")); - MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.upToReferenceContainerNode(ActivitySeineReference.class, routeNode); + MultipleReferenceContainerNode<ActivitySeineDto, ActivitySeineReference> parentNode = MultipleReferenceContainerNode.downToReferenceContainerNode(ActivitySeineReference.class, routeNode); tree.selectSafeNode(parentNode); log.debug("PARENT NODE = " + parentNode); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/open/CloseOpenDataUIAction.java ===================================== @@ -102,7 +102,8 @@ public class CloseOpenDataUIAction extends AbstractContentUIAction { //FIXME See what does it means ? getMainUI().getHandler().updateContentSize(); } catch (CloseEditNodeVetoException e1) { - UIHelper.handlingError(e1); + log.error("Could not close data from callback", e1); +// UIHelper.handlingError(e1); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a4430687baa9a077ce0b05bd8c28... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a4430687baa9a077ce0b05bd8c28... You're receiving this email because of your account on gitlab.com.