Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f30f4fb0 by tchemit at 2020-04-16T11:30:05+02:00 Problème de rafraîchissement sur les formulaire de type tableau - Closes #1467 - - - - - 6f74f5f1 by tchemit at 2020-04-16T11:30:53+02:00 Revoir la gestion du focus sur les formulaires à onglets, ne pas changer d'onglet après une sauvegarde - Closes #1466 - - - - - 3 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripUIHelper.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/BranchlineUIReset.java Changes: ===================================== client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUIHandler.java ===================================== @@ -204,7 +204,10 @@ public abstract class ContentTableUIHandler<D extends DataDto, C extends DataDto if (selectedRow == -1) { selectedRow = 0; } - log.info("Select row: " + selectedRow); + if (selectedRow >= tableModel.getRowCount()) { + selectedRow = 0; + } + log.info(String.format("Select row: %d", selectedRow)); tableModel.changeSelectedRow(-1); tableModel.changeSelectedRow(selectedRow); } ===================================== client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripUIHelper.java ===================================== @@ -71,7 +71,7 @@ public abstract class TripUIHelper<U extends ContentOpenableUI & TripUI> impleme } public void onOpenAfterOpenModel() { - ui.getMainTabbedPane().setSelectedIndex(0); +// ui.getMainTabbedPane().setSelectedIndex(0); closeMap(); } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/BranchlineUIReset.java ===================================== @@ -37,6 +37,7 @@ public class BranchlineUIReset extends Reset<BranchlineUI> { @Override public void doReset() { super.doReset(); + ui.getModel().setResetEdit(true); BranchlineUIHandler handler = ui.getHandler(); try { BranchlineDto branchline = ui.getModel().getBranchline(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f6e4b3060433f9dc75c1d7ecc... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f6e4b3060433f9dc75c1d7ecc... You're receiving this email because of your account on gitlab.com.