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 2021/10/02 16:26:32 UTC
[isis-app-demo] tag tags/03-10-optional created (now f9854d4)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to tag tags/03-10-optional
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git.
at f9854d4 (commit)
This tag includes the following new commits:
new f9854d4 uses layout file to associate properties with fieldsets
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.
[isis-app-demo] 01/01: uses layout file to associate properties
with fieldsets
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to tag tags/03-10-optional
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit f9854d4d21efa0dc322580a8a0702ab0be19ea64
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Oct 2 17:25:16 2021 +0100
uses layout file to associate properties with fieldsets
---
.../main/java/petclinic/modules/pets/dom/petowner/PetOwner.java | 6 +++---
.../java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml | 9 +++++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
index 4488aed..3d4878f 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.java
@@ -124,13 +124,13 @@ public class PetOwner implements Comparable<PetOwner> {
@PhoneNumber
@Column(length = PhoneNumber.MAX_LEN, nullable = true)
- @PropertyLayout(fieldSetId = "contactDetails", sequence = "1")
+// @PropertyLayout(fieldSetId = "contactDetails", sequence = "1")
@Getter @Setter
private String phoneNumber;
@EmailAddress
@Column(length = EmailAddress.MAX_LEN, nullable = true)
- @PropertyLayout(fieldSetId = "contactDetails", sequence = "2")
+// @PropertyLayout(fieldSetId = "contactDetails", sequence = "2")
@Getter @Setter
private String emailAddress;
@@ -138,7 +138,7 @@ public class PetOwner implements Comparable<PetOwner> {
@Column(length = Notes.MAX_LEN, nullable = true)
@Getter @Setter
@Property(commandPublishing = Publishing.ENABLED, executionPublishing = Publishing.ENABLED)
- @PropertyLayout(fieldSetId = "notes", sequence = "1")
+// @PropertyLayout(fieldSetId = "notes", sequence = "1")
private String notes;
diff --git a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
index 2b23056..b697ece 100644
--- a/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
+++ b/module-pets/src/main/java/petclinic/modules/pets/dom/petowner/PetOwner.layout.xml
@@ -31,8 +31,13 @@
</bs3:row>
</bs3:tab>
</bs3:tabGroup>
- <c:fieldSet id="contactDetails" name="Contact Details"/>
- <c:fieldSet id="notes" name="Notes"/>
+ <c:fieldSet id="contactDetails" name="Contact Details">
+ <c:property id="phoneNumber"/>
+ <c:property id="emailAddress"/>
+ </c:fieldSet>
+ <c:fieldSet id="notes" name="Notes">
+ <c:property id="notes"/>
+ </c:fieldSet>
</bs3:col>
<bs3:col span="6">
<bs3:tabGroup unreferencedCollections="true">