You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2022/10/02 11:54:03 UTC
[isis] branch master updated (674b14668b -> e413e812ff)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
from 674b14668b ISIS-2965: improves release docs
add eef0a5488f ISIS-2965: improves release docs
add 6b883b50bd ISIS-3230 : fixes for queries
add 99baae682e ISIS-3234: fixes deletion of jdo
new e413e812ff ISIS-3236: trivial improvements
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/ROOT/pages/cutting-a-release.adoc | 4 ++--
.../isis/applib/services/user/UserMemento.java | 8 +++----
.../services/user/UserMemento.layout.fallback.xml | 25 ++++++++++++++++++++--
.../commandlog/jdo/dom/CommandLogEntry.java | 2 +-
.../executionlog/jdo/dom/ExecutionLogEntry.java | 8 +++----
.../executionlog/jpa/dom/ExecutionLogEntry.java | 16 +++++++-------
.../applib/dom/ExecutionOutboxEntry.java | 5 ++---
7 files changed, 44 insertions(+), 24 deletions(-)
[isis] 01/01: ISIS-3236: trivial improvements
Posted by da...@apache.org.
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 <da...@haywood-associates.co.uk>
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"/>