Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 3b40bcfb by Tony CHEMIT at 2018-09-18T23:36:56Z Only remove program node if it is enabled (otherwise it is not in navigation tree) - - - - - 0fbe5ba1 by Tony CHEMIT at 2018-09-18T23:58:06Z [SYNCHRO] Problème avec la synchro avancée d'un programme - Closes #1063 - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java ===================================== @@ -828,7 +828,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer @Override protected void afterDelete() { D bean = getBean(); - if (bean instanceof ProgramDto) { + if (bean instanceof ProgramDto && bean.isEnabled()) { // remove the program in tree NavigationTree treeHelper = getNavigationTree(); ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java ===================================== @@ -157,7 +157,8 @@ public class ReferentialSynchronizeSqlsRequestBuilder { @Override protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) { - return addExtraInsertStatement(id, binder); + ReferentialDtoEntityContext<DD, ?, ?> modelContext = DbModelHelper.fromReferentialDto(referentialType); + return addExtraInsertStatement(id, modelContext.toEntityBinder()); } }; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c49a8186278f983f8ea6f77c064... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c49a8186278f983f8ea6f77c064... You're receiving this email because of your account on gitlab.com.