Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: c60939d4 by tchemit at 2020-02-19T16:19:50+01:00 [SYNCHRO AVANCEE] Lorsqu'aucune action de synchro n'est empilée, 'Appliquer' devrait être inactif - Closes #1444 - - - - - cecddb82 by tchemit at 2020-02-19T16:24:36+01:00 [SYNCHRO AVANCEE] Fonctionnement des sélections - Closes #1440 - - - - - 3 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== @@ -364,5 +364,6 @@ public class ReferentialSynchroModel extends AdminActionModel { setSynchronizeMode(ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT); setShowProperties(true); + ((ReferentialSynchroUI)ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE)).getApplyAction().setEnabled(false); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java ===================================== @@ -226,6 +226,9 @@ public abstract class RegisterTasksActionSupport extends ObserveActionSupport { treeModel.removeReferenceNodes(removedNodes); ui.getStepModel().getTasks().addTasks(addedTasks); + if (!ui.getStepModel().getTasks().isEmpty()) { + ui.getApplyAction().setEnabled(true); + } } protected Collection<ReferenceReferentialSynchroNodeSupport> getReferenceReferentialSynchroNodes(Predicate<ReferenceReferentialSynchroNodeSupport> predicate) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/ReferentialSelectionTree.java ===================================== @@ -120,9 +120,7 @@ public class ReferentialSelectionTree extends JXTree { ReferentialSynchroNodeSupport node = (ReferentialSynchroNodeSupport) lastPathComponent; boolean newValue = !node.isSelected(); log.info(String.format("Node: %s - new selected value: %s", node, newValue)); - node.setSelected(newValue); - getModel().valueForPathChanged(path, node.getUserObject()); - updateActions(); + getTreeModel().setValueAt(node, newValue); } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0016aa37b80bf3e0f89720d8f... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0016aa37b80bf3e0f89720d8f... You're receiving this email because of your account on gitlab.com.