This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch jdo-SNAPSHOT in repository https://gitbox.apache.org/repos/asf/isis-app-simpleapp.git
commit 283b26b6ae6735c49281b44a82d44b258e693bbd Author: Dan Haywood <[email protected]> AuthorDate: Thu Sep 1 11:18:44 2022 +0100 adds support for using datatable decoration --- .../java/domainapp/modules/simple/dom/so/SimpleObject.java | 3 ++- .../application/services/homepage/HomePageViewModel.java | 3 +++ webapp/src/main/resources/application.yml | 10 +++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java index 31d21b8..60a6559 100644 --- a/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java +++ b/module-simple/src/main/java/domainapp/modules/simple/dom/so/SimpleObject.java @@ -39,6 +39,7 @@ import org.apache.isis.applib.annotation.PromptStyle; import org.apache.isis.applib.annotation.Property; import org.apache.isis.applib.annotation.PropertyLayout; import org.apache.isis.applib.annotation.Publishing; +import org.apache.isis.applib.annotation.TableDecoration; import org.apache.isis.applib.annotation.Title; import org.apache.isis.applib.jaxb.PersistentEntityAdapter; import org.apache.isis.applib.layout.LayoutConstants; @@ -90,7 +91,7 @@ import domainapp.modules.simple.types.Notes; @EntityListeners(IsisEntityListener.class) @Named(SimpleModule.NAMESPACE + ".SimpleObject") @DomainObject(entityChangePublishing = Publishing.ENABLED) -@DomainObjectLayout() +@DomainObjectLayout(tableDecoration = TableDecoration.DATATABLES_NET) @NoArgsConstructor(access = AccessLevel.PUBLIC) @XmlJavaTypeAdapter(PersistentEntityAdapter.class) @ToString(onlyExplicitlyIncluded = true) diff --git a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java index 6365227..ad26686 100644 --- a/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java +++ b/webapp/src/main/java/domainapp/webapp/application/services/homepage/HomePageViewModel.java @@ -6,6 +6,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.apache.isis.applib.annotation.Collection; +import org.apache.isis.applib.annotation.CollectionLayout; import org.apache.isis.applib.annotation.Domain; import org.apache.isis.applib.annotation.DomainObject; import org.apache.isis.applib.annotation.DomainObjectLayout; @@ -13,6 +14,7 @@ import org.apache.isis.applib.annotation.HomePage; import org.apache.isis.applib.annotation.MemberSupport; import org.apache.isis.applib.annotation.Nature; import org.apache.isis.applib.annotation.ObjectSupport; +import org.apache.isis.applib.annotation.TableDecoration; import domainapp.modules.simple.SimpleModule; import domainapp.modules.simple.dom.so.SimpleObject; @@ -29,6 +31,7 @@ public class HomePageViewModel { } @Collection + @CollectionLayout(tableDecoration = TableDecoration.DATATABLES_NET) public List<SimpleObject> getObjects() { return simpleObjects.listAll(); } diff --git a/webapp/src/main/resources/application.yml b/webapp/src/main/resources/application.yml index 38a09a9..878454e 100644 --- a/webapp/src/main/resources/application.yml +++ b/webapp/src/main/resources/application.yml @@ -23,7 +23,10 @@ isis: domain-object: editing: false entity-change-publishing: all - + domain-object-layout: + table-decoration: none + collection-layout: + table-decoration: none core: meta-model: introspector: @@ -84,6 +87,11 @@ isis: themes: show-chooser: true + table: + decoration: + data-tables-net: + options: "info: false, pagingType: 'numbers'" + testing: fixtures: fixture-scripts-specification:
