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 2014/12/30 15:30:29 UTC
isis git commit: ISIS-970: also update LayoutMetadataReaderFromJson
to parse for xxx.layout.json for actionLayout(bookmarking=...)
Repository: isis
Updated Branches:
refs/heads/ISIS-970 b1067d027 -> 6063c61c0
ISIS-970: also update LayoutMetadataReaderFromJson to parse for xxx.layout.json for actionLayout(bookmarking=...)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6063c61c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6063c61c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6063c61c
Branch: refs/heads/ISIS-970
Commit: 6063c61c0e6568057064a7f050f9823993259d06
Parents: b1067d0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Dec 30 14:30:24 2014 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Dec 30 14:30:24 2014 +0000
----------------------------------------------------------------------
.../layoutmetadata/json/LayoutMetadataReaderFromJson.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6063c61c/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
index c3098c7..193c74f 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
@@ -320,6 +320,9 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader {
final ActionLayoutFacetRepr actionLayout = actionRepr.actionLayout;
if(actionLayout != null) {
+ if(actionLayout.bookmarking != null) {
+ props.setProperty(prefix + "." + actionName + ".actionLayout.bookmarking", ""+actionLayout.bookmarking);
+ }
if(actionLayout.cssClass != null) {
props.setProperty(prefix + "." + actionName + ".actionLayout.cssClass", actionLayout.cssClass);
}