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/16 16:58:08 UTC
[1/2] isis git commit: ISIS-1618: reverts fix from pr-84 for now;
need to understand better.
Repository: isis
Updated Branches:
refs/heads/master abc2daf9e -> f9e034e99
ISIS-1618: reverts fix from pr-84 for now; need to understand better.
The pr-84 fix, while perhaps correct, has an impact on any code written exploiting its behaviour. Maybe that's fine, in which case will just revert *this* commit. But will look at in more detail first.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4748d098
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4748d098
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4748d098
Branch: refs/heads/master
Commit: 4748d0986e39535a3477ac1d8f3a389045da97ad
Parents: 5ba685c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Fri Sep 15 12:15:33 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Sep 15 12:15:33 2017 +0100
----------------------------------------------------------------------
.../isis/viewer/wicket/ui/components/layout/bs3/col/Col.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/4748d098/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
index 0770f66..11dbd06 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/layout/bs3/col/Col.java
@@ -263,14 +263,12 @@ public class Col extends PanelAbstract<EntityModel> implements HasDynamicallyVis
final RepeatingViewWithDynamicallyVisibleContent collectionRv =
new RepeatingViewWithDynamicallyVisibleContent(ID_COLLECTIONS);
- final EntityModel entityModel = getModel();
- final CollectionLayoutData snapshot = entityModel.getCollectionLayoutData();
-
for (CollectionLayoutData collection : collections) {
final String id = collectionRv.newChildId();
// we successively trample over the layout data; but that's ok, this is synchronous code anyway...
+ final EntityModel entityModel = getModel();
entityModel.setCollectionLayoutData(collection);
// the entityModel's getLayoutData() provides the hint as to which collection of the entity to render.
@@ -282,10 +280,6 @@ public class Col extends PanelAbstract<EntityModel> implements HasDynamicallyVis
}
div.add(collectionRv);
visible = visible || collectionRv.isVisible();
-
- //XXX ISIS-1698 restore original state after trampling over
- entityModel.setCollectionLayoutData(snapshot);
-
} else {
Components.permanentlyHide(div, ID_COLLECTIONS);
}
[2/2] isis git commit: Merge remote-tracking branch 'origin/master'
Posted by da...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/f9e034e9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/f9e034e9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/f9e034e9
Branch: refs/heads/master
Commit: f9e034e995ec010e485e620b2684e85212464d16
Parents: 4748d09 abc2daf
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Sep 16 17:57:46 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Sep 16 17:57:46 2017 +0100
----------------------------------------------------------------------
.../guides/ugbtb/_ugbtb_hints-and-tips.adoc | 2 +
...hints-and-tips_view-model-instantiation.adoc | 160 +++++++++++++++++++
.../images/hints-and-tips/view-model-fail.png | Bin 0 -> 6960 bytes
.../hints-and-tips/view-model-success.png | Bin 0 -> 7046 bytes
4 files changed, 162 insertions(+)
----------------------------------------------------------------------