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 2015/01/20 07:48:43 UTC

[27/38] isis git commit: ISIS-970: also update LayoutMetadataReaderFromJson to parse for xxx.layout.json for actionLayout(bookmarking=...)

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/fcdecbd0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/fcdecbd0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/fcdecbd0

Branch: refs/heads/ISIS-970
Commit: fcdecbd0e27537837c59ce236740bfa0bf6f29f6
Parents: f9b0238
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: Mon Jan 19 08:33:58 2015 +0000

----------------------------------------------------------------------
 .../layoutmetadata/json/LayoutMetadataReaderFromJson.java         | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/fcdecbd0/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 8a8705e..b836808 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
@@ -328,6 +328,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);
             }