You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/06/30 17:23:19 UTC
[isis] branch master updated: ISIS-2383: partly fixed: ensures we
have attached child entities on the target we operate on (when editing
properties)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 07eb8f6 ISIS-2383: partly fixed: ensures we have attached child entities on the target we operate on (when editing properties)
07eb8f6 is described below
commit 07eb8f6c27e7f7b1f879bdfa50bf08debb14a3d1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Tue Jun 30 19:23:01 2020 +0200
ISIS-2383: partly fixed: ensures we have attached child entities on the
target we operate on (when editing properties)
---
.../jaxbrefentity/StatefulViewModelJaxbRefsEntity.java | 4 ++--
.../apache/isis/viewer/wicket/model/models/ActionModel.java | 6 +++---
.../apache/isis/viewer/wicket/model/models/ScalarModel.java | 12 +++++++-----
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java
index c607360..92a26bc 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/viewmodels/jaxbrefentity/StatefulViewModelJaxbRefsEntity.java
@@ -90,10 +90,10 @@ public class StatefulViewModelJaxbRefsEntity implements HasAsciiDocDescription {
// TODO: using an editable property fails ...
public List<ChildJdoEntity> choicesFavoriteChild() {
- return choices0ChangeFavoriteChild(); // reuse same logic
+ return choices0ChangeFavoriteChild(); // reuse logic from above
}
public String disableFavoriteChild() {
- return getChildren().isEmpty() ? "no children" : null;
+ return disableChangeFavoriteChild(); // reuse logic from above
}
//tag::class[]
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
index a3426d6..6d2285f 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ActionModel.java
@@ -396,11 +396,11 @@ implements FormUiModel, FormExecutorContext, BookmarkableModel {
@Override
public Stream<FormPendingParamUiModel> streamPendingParamUiModels() {
- val targetAdapter = this.getOwner();
- val realTargetAdapter = this.getMetaModel().realTargetAdapter(targetAdapter);
+ val owner = this.getOwner();
+ val target = this.getMetaModel().realTargetAdapter(owner);
val pendingArgs = getArgumentsAsParamModel();
- val head = InteractionHead.of(targetAdapter, realTargetAdapter);
+ val head = InteractionHead.of(owner, target);
return argCache()
.streamParamUiModels()
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index 9009c15..1515586 100644
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -130,13 +130,15 @@ implements HasRenderingHints, ScalarUiModel, LinksProvider, FormExecutorContext
return parentEntityModel;
}
- private transient ManagedObject owner;
+ //XXX[ISIS-2383] don't cache always load from parent model
+ //private transient ManagedObject owner;
@Override
public ManagedObject getOwner() {
- if(owner==null) {
- owner = getParentUiModel().load();
- }
- return owner;
+// if(owner==null) {
+// owner = getParentUiModel().load();
+// }
+// return owner;
+ return getParentUiModel().load();
}
/**