Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
c4301b93
by Tony CHEMIT at 2017-08-15T15:42:56+02:00
2 changed files:
- client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java
- services/src/main/java/fr/ird/observe/services/service/DataSourceService.java
Changes:
| ... | ... | @@ -792,7 +792,9 @@ public class StorageUIHandler implements UIHandler<StorageUI> { |
| 792 | 792 |
Boolean apply = (Boolean) abstractButton.getClientProperty("apply");
|
| 793 | 793 |
if (apply != null && apply) {
|
| 794 | 794 |
SwingUtilities.invokeLater(() -> {
|
| 795 |
- ui.getNextAction().doClick();
|
|
| 795 |
+ if (ui.getModel().getNextStep()!=null) {
|
|
| 796 |
+ ui.getNextAction().doClick();
|
|
| 797 |
+ }
|
|
| 796 | 798 |
ui.getApplyAction().doClick();
|
| 797 | 799 |
});
|
| 798 | 800 |
}
|
| ... | ... | @@ -63,7 +63,7 @@ public interface DataSourceService extends ObserveService, Closeable { |
| 63 | 63 |
@Get(addAuthtoken = false)
|
| 64 | 64 |
void migrateData(ObserveDataSourceConfiguration dataSourceConfiguration);
|
| 65 | 65 |
|
| 66 |
- @Get(addAuthtoken = false)
|
|
| 66 |
+ @Get
|
|
| 67 | 67 |
Set<Class<? extends ReferentialDto>> getReferentialTypesInShell();
|
| 68 | 68 |
|
| 69 | 69 |
@Get
|