[isis-app-helloworld] 01/01: Merge branch 'jdo' into jpa

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch jpa
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git

commit c3d565a03f010577c8f24f4962f2a9f7ef76ab2c
Merge: fea9ea4 bbe4ecf
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri May 14 09:30:11 2021 +0100

    Merge branch 'jdo' into jpa

 .../modules/hello/dom/hwo/HelloWorldObject.java    |  7 ++-
 .../hello/dom/hwo/HelloWorldObject.layout.xml      | 19 ++----
 src/main/resources/menubars.layout.xml             | 72 +++++-----------------
 3 files changed, 27 insertions(+), 71 deletions(-)

diff --cc src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 6395911,3c9127f..d3bd6be
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@@ -63,9 -60,9 +65,10 @@@ public class HelloWorldObject implement
      }
  
      @Notes
 +    @javax.persistence.Column(length = Notes.MAX_LEN, nullable = true)
      @MemberOrder(name = "details", sequence = "1")
      private String notes;
+     @PropertyLayout(multiLine = 10, hidden = Where.ALL_TABLES)
      public String getNotes() {
          return notes;
      }