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/09/21 10:41:51 UTC
[4/6] isis git commit: ISIS-1466: adds null guard which fixes
Hidden(Where.PARENTED_TABLES),
and testing Hidden(Where.REFERENCES_PARENT) this also seems to be ok.
ISIS-1466: adds null guard which fixes Hidden(Where.PARENTED_TABLES), and testing Hidden(Where.REFERENCES_PARENT) this also seems to be ok.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f8ecbde4
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f8ecbde4
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f8ecbde4
Branch: refs/heads/master
Commit: f8ecbde40c8014ebd24d868c3fb058d84b7b9ab9
Parents: 2493cf8
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Sep 21 11:21:41 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Sep 21 11:21:41 2017 +0100
----------------------------------------------------------------------
.../ajaxtable/CollectionContentsAsAjaxTablePanel.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/f8ecbde4/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index 8f5541c..94ca53d 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -205,8 +205,10 @@ public class CollectionContentsAsAjaxTablePanel
for (final String propertyId : propertyIds) {
final ObjectAssociation property = propertyById.get(propertyId);
- final ColumnAbstract<ObjectAdapter> nopc = createObjectAdapterPropertyColumn(property);
- columns.add(nopc);
+ if(property != null) {
+ final ColumnAbstract<ObjectAdapter> nopc = createObjectAdapterPropertyColumn(property);
+ columns.add(nopc);
+ }
}
}