This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/isis.git
commit e413e812ffb13e946b1b2f2774bcb46569e19ddf Author: Dan Haywood <[email protected]> AuthorDate: Sun Oct 2 12:53:52 2022 +0100 ISIS-3236: trivial improvements --- .../isis/applib/services/user/UserMemento.java | 8 +++---- .../services/user/UserMemento.layout.fallback.xml | 25 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java index 19fd3d1092..c57de689c3 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java +++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.java @@ -190,13 +190,13 @@ implements Serializable { Locale languageLocale; @Property(optionality = Optionality.OPTIONAL) - @PropertyLayout(fieldSetId = "details", sequence = "2") + @PropertyLayout(fieldSetId = "regional", sequence = "2") @Getter @With(onMethod_ = {@Programmatic}) @Nullable Locale numberFormatLocale; @Property(optionality = Optionality.OPTIONAL) - @PropertyLayout(fieldSetId = "details", sequence = "3") + @PropertyLayout(fieldSetId = "regional", sequence = "3") @Getter @With(onMethod_ = {@Programmatic}) @Nullable Locale timeFormatLocale; @@ -228,7 +228,7 @@ implements Serializable { @Property(optionality = Optionality.OPTIONAL) - @PropertyLayout(fieldSetId = "security", sequence = "2") + @PropertyLayout(fieldSetId = "security", sequence = "3") @Getter @Builder.Default @With(onMethod_ = {@Programmatic}) boolean impersonating = false; @@ -241,7 +241,7 @@ implements Serializable { * </p> */ @Property(optionality = Optionality.OPTIONAL) - @PropertyLayout(fieldSetId = "security", sequence = "3") + @PropertyLayout(fieldSetId = "security", sequence = "2") @Getter @With(onMethod_ = {@Programmatic}) @Nullable String multiTenancyToken; diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml index abe976c7b0..79c591b592 100644 --- a/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml +++ b/api/applib/src/main/java/org/apache/isis/applib/services/user/UserMemento.layout.fallback.xml @@ -52,8 +52,29 @@ under the License. </bs3:row> </bs3:tab> </bs3:tabGroup> - <cpt:fieldSet name="Details" id="details"/> - <cpt:fieldSet name="Security" id="security"/> + <bs3:tabGroup> + <bs3:tab name="Details"> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="" id="details"/> + </bs3:col> + </bs3:row> + </bs3:tab> + <bs3:tab name="Regional"> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="" id="regional"/> + </bs3:col> + </bs3:row> + </bs3:tab> + <bs3:tab name="Security"> + <bs3:row> + <bs3:col span="12"> + <cpt:fieldSet name="" id="security"/> + </bs3:col> + </bs3:row> + </bs3:tab> + </bs3:tabGroup> </bs3:col> <bs3:col span="6"> <cpt:collection id="roles"/>
