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 2016/05/12 14:52:11 UTC
[2/2] isis git commit: ISIS-1400: filter out any bulk-only actions.
ISIS-1400: filter out any bulk-only actions.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/b8d19e67
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/b8d19e67
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/b8d19e67
Branch: refs/heads/ISIS-1291
Commit: b8d19e67d7f24c4a08683d1f77b9c80160d1dec8
Parents: ea7c190
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu May 12 15:51:12 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu May 12 15:51:12 2016 +0100
----------------------------------------------------------------------
.../services/grid/bootstrap3/GridSystemServiceBS3.java | 8 ++++++--
.../actionmenu/entityactions/EntityActionLinkFactory.java | 3 ++-
2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/b8d19e67/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
index 8e1eafa..1d51fff 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/grid/bootstrap3/GridSystemServiceBS3.java
@@ -40,6 +40,7 @@ import org.apache.isis.applib.annotation.DomainService;
import org.apache.isis.applib.annotation.MemberGroupLayout;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.filter.Filters;
import org.apache.isis.applib.layout.component.ActionLayoutData;
import org.apache.isis.applib.layout.component.ActionLayoutDataOwner;
import org.apache.isis.applib.layout.component.CollectionLayoutData;
@@ -173,8 +174,11 @@ public class GridSystemServiceBS3 extends GridSystemServiceAbstract<BS3Grid> {
final Map<String, OneToManyAssociation> oneToManyAssociationById =
ObjectMember.Util.mapById(getOneToManyAssociations(objectSpec));
final Map<String, ObjectAction> objectActionById =
- ObjectMember.Util.mapById(objectSpec.getObjectActions(Contributed.INCLUDED));
-
+ ObjectMember.Util.mapById(
+ FluentIterable
+ .from(objectSpec.getObjectActions(Contributed.INCLUDED))
+ .filter(Filters.asPredicate(ObjectAction.Filters.notBulkOnly()))
+ .toList());
final BS3Grid bs3Grid = (BS3Grid) grid;
http://git-wip-us.apache.org/repos/asf/isis/blob/b8d19e67/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
index 698dcf9..336f27e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/EntityActionLinkFactory.java
@@ -56,7 +56,8 @@ public final class EntityActionLinkFactory extends ActionLinkFactoryAbstract {
final Boolean persistent = objectAdapter.representsPersistent();
if (!persistent) {
- throw new IllegalArgumentException("Object '" + objectAdapter.titleString(null) + "' is not persistent.");
+ throw new IllegalArgumentException(String.format(
+ "Object '%s' is not persistent.", objectAdapter.titleString(null)));
}
// check visibility and whether enabled