You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/07/02 12:56:38 UTC
[isis] branch master updated: ISIS-2786: add a tab with multiple
fieldsets to demo
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 2594e2e ISIS-2786: add a tab with multiple fieldsets to demo
2594e2e is described below
commit 2594e2e6aafe60f7f1345f949a2638eab1483e4b
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Jul 2 14:56:27 2021 +0200
ISIS-2786: add a tab with multiple fieldsets to demo
---
.../java/demoapp/dom/featured/layout/tabs/TabDemo.java | 13 ++++++++++---
.../demoapp/dom/featured/layout/tabs/TabDemo.layout.xml | 16 +++++++++++++++-
2 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
index 77ef963..05023cd 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.java
@@ -25,13 +25,14 @@ import javax.xml.bind.annotation.XmlType;
import org.apache.isis.applib.annotation.Action;
import org.apache.isis.applib.annotation.DomainObject;
+import org.apache.isis.applib.annotation.Editing;
import org.apache.isis.applib.annotation.Nature;
+import org.apache.isis.applib.annotation.Property;
+import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
import lombok.Getter;
import lombok.Setter;
-import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
-
@XmlRootElement(name = "Demo")
@XmlType
@XmlAccessorType(XmlAccessType.FIELD)
@@ -64,10 +65,16 @@ public class TabDemo implements HasAsciiDocDescription {
return hidden;
}
- // -- DEMO FIELD 2
+ // -- DEMO FIELD 2-4
@Getter @Setter private String field2 = "field 2";
+ @Property(editing = Editing.ENABLED)
+ @Getter @Setter private String field3 = "field 3";
+
+ @Property(editing = Editing.ENABLED)
+ @Getter @Setter private String field4 = "field 4";
+
// ---
private boolean hidden = false;
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
index 387f4ba..11fe968 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/featured/layout/tabs/TabDemo.layout.xml
@@ -43,12 +43,26 @@
<bs3:tab name="Tab 2">
<bs3:row>
<bs3:col span="12">
- <cpt:fieldSet id="fs2">
+ <cpt:fieldSet id="fs2"> <!-- unnamed fieldset -->
<cpt:property id="field2"/>
</cpt:fieldSet>
</bs3:col>
</bs3:row>
</bs3:tab>
+
+ <bs3:tab name="Tab 3">
+ <bs3:row>
+ <bs3:col span="12">
+ <cpt:fieldSet id="fs3" name="Fieldset 3">
+ <cpt:property id="field3"/>
+ </cpt:fieldSet>
+ <cpt:fieldSet id="fs4" name="Fieldset 4">
+ <cpt:property id="field4"/>
+ </cpt:fieldSet>
+ </bs3:col>
+ </bs3:row>
+ </bs3:tab>
+
</bs3:tabGroup>
<!-- <cpt:fieldSet name="Tabs" id="tabs"> -->