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 2017/01/19 11:09:09 UTC
[03/24] isis git commit: ISIS-1565: fixes wicket UI so that DROPDOWN
position for mixin actions (as per @MemberOrder) continues to be honoured if
it is not overridden in layout.xml
ISIS-1565: fixes wicket UI so that DROPDOWN position for mixin actions (as per @MemberOrder) continues to be honoured if it is not overridden in layout.xml
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4027a0b6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4027a0b6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4027a0b6
Branch: refs/heads/maint-1.13.3
Commit: 4027a0b6e1fd6883224aeab4ec36d18247760638
Parents: ec12417
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jan 9 23:53:04 2017 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jan 18 09:51:00 2017 +0000
----------------------------------------------------------------------
.../metamodel/facets/actions/layout/ActionLayoutFacetFactory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4027a0b6/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
index 5803825..6b2251e 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/actions/layout/ActionLayoutFacetFactory.java
@@ -188,7 +188,7 @@ public class ActionLayoutFacetFactory extends FacetFactoryAbstract implements Co
// position
ActionPositionFacet actionPositionFacet = ActionPositionFacetOnActionFromLayoutProperties.create(properties, holder);
- if(actionPositionFacet == null) {
+ if(actionPositionFacet == null && ! holder.containsDoOpFacet(ActionPositionFacet.class)) {
actionPositionFacet = new ActionPositionFacetFallback(holder);
}
FacetUtil.addFacet(actionPositionFacet);