| ... |
... |
@@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.actions.content.api.ref; |
|
25
|
25
|
import fr.ird.observe.client.ObserveSwingApplicationContext;
|
|
26
|
26
|
import fr.ird.observe.client.ui.ObserveKeyStrokes;
|
|
27
|
27
|
import fr.ird.observe.client.ui.ObserveMainUI;
|
|
|
28
|
+import fr.ird.observe.client.ui.content.api.ContentMode;
|
|
28
|
29
|
import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUI;
|
|
29
|
30
|
import fr.ird.observe.client.ui.content.api.ref.ContentReferenceUIModel;
|
|
30
|
31
|
import fr.ird.observe.client.ui.content.ref.usage.UsageForDesactivateUIHandler;
|
| ... |
... |
@@ -94,7 +95,7 @@ public class SaveReferentialUIAction<D extends ReferentialDto, R extends Referen |
|
94
|
95
|
log.info("Create referentiel " + bean);
|
|
95
|
96
|
SaveResultDto saveResult = getServicesProvider().getReferentialService().save(bean);
|
|
96
|
97
|
saveResult.toDto(bean);
|
|
97
|
|
- afterSave(ui, bean, notPersisted);
|
|
|
98
|
+// afterSave(ui, bean, notPersisted);
|
|
98
|
99
|
return true;
|
|
99
|
100
|
}
|
|
100
|
101
|
|
| ... |
... |
@@ -152,7 +153,7 @@ public class SaveReferentialUIAction<D extends ReferentialDto, R extends Referen |
|
152
|
153
|
// sauvegarde du bean d'edition dans le bean de la base
|
|
153
|
154
|
SaveResultDto saveResult = getServicesProvider().getReferentialService().save(bean);
|
|
154
|
155
|
saveResult.toDto(bean);
|
|
155
|
|
- afterSave(ui, bean, notPersisted);
|
|
|
156
|
+// afterSave(ui, bean, notPersisted);
|
|
156
|
157
|
return true;
|
|
157
|
158
|
}
|
|
158
|
159
|
|
| ... |
... |
@@ -187,6 +188,21 @@ public class SaveReferentialUIAction<D extends ReferentialDto, R extends Referen |
|
187
|
188
|
FormDefinition<D> formDefinition = formDefinitionOptional.get();
|
|
188
|
189
|
model.getReferenceCache().loadReferentialReferenceSetsInModel(formDefinition, true);
|
|
189
|
190
|
}
|
|
|
191
|
+
|
|
|
192
|
+ if (notPersisted) {
|
|
|
193
|
+ ui.getModel().setMode(ContentMode.UPDATE);
|
|
|
194
|
+ }
|
|
|
195
|
+ ui.getModel().updateUiWithReferenceSetsFromModel();
|
|
|
196
|
+ int size = ui.getList().getModel().getSize();
|
|
|
197
|
+ R selectedValue = null;
|
|
|
198
|
+ for (int i = 0; i < size; i++) {
|
|
|
199
|
+ R elementAt = ui.getList().getModel().getElementAt(i);
|
|
|
200
|
+ if (elementAt.getId().equals(bean.getId())) {
|
|
|
201
|
+ selectedValue = elementAt;
|
|
|
202
|
+ break;
|
|
|
203
|
+ }
|
|
|
204
|
+ }
|
|
|
205
|
+ ui.getList().setSelectedValue(selectedValue, false);
|
|
190
|
206
|
}
|
|
191
|
207
|
|
|
192
|
208
|
}
|