Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
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:
| ... | ... | @@ -828,7 +828,7 @@ public class ContentReferenceUIHandler<D extends ReferentialDto, R extends Refer |
| 828 | 828 |
@Override
|
| 829 | 829 |
protected void afterDelete() {
|
| 830 | 830 |
D bean = getBean();
|
| 831 |
- if (bean instanceof ProgramDto) {
|
|
| 831 |
+ if (bean instanceof ProgramDto && bean.isEnabled()) {
|
|
| 832 | 832 |
|
| 833 | 833 |
// remove the program in tree
|
| 834 | 834 |
NavigationTree treeHelper = getNavigationTree();
|
| ... | ... | @@ -157,7 +157,8 @@ public class ReferentialSynchronizeSqlsRequestBuilder { |
| 157 | 157 |
|
| 158 | 158 |
@Override
|
| 159 | 159 |
protected <DD extends ReferentialDto> ImmutableList<String> insertMissingReferential(Class<DD> referentialType, String id) {
|
| 160 |
- return addExtraInsertStatement(id, binder);
|
|
| 160 |
+ ReferentialDtoEntityContext<DD, ?, ?> modelContext = DbModelHelper.fromReferentialDto(referentialType);
|
|
| 161 |
+ return addExtraInsertStatement(id, modelContext.toEntityBinder());
|
|
| 161 | 162 |
}
|
| 162 | 163 |
};
|
| 163 | 164 |
|