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 2013/10/15 09:46:47 UTC
git commit: ISIS-565: honour NotPersistedFacet...
Updated Branches:
refs/heads/master 5e9d586a3 -> e521a1222
ISIS-565: honour NotPersistedFacet...
... when flushing EntityModel's collection of propertyScalarModels when the form is submitted.
What was happening here is that the contributed property 'lastInvoice' (in
Estatio) has no value on it, and also has no facet to handle it being
modified (it should not need one, since it declares itself to be not-persisted
using the NotPersistedFacet)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e521a122
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e521a122
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e521a122
Branch: refs/heads/master
Commit: e521a12228a871ca8c217e1053c858304b7a0b46
Parents: 5e9d586
Author: Dan Haywood <da...@apache.org>
Authored: Tue Oct 15 08:46:27 2013 +0100
Committer: Dan Haywood <da...@apache.org>
Committed: Tue Oct 15 08:46:27 2013 +0100
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/model/models/EntityModel.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e521a122/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
index 889306e..e1791da 100644
--- a/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
+++ b/component/viewer/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/EntityModel.java
@@ -35,6 +35,7 @@ import org.apache.isis.core.metamodel.adapter.oid.OidMarshaller;
import org.apache.isis.core.metamodel.adapter.oid.RootOid;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.facets.notpersisted.NotPersistedFacet;
import org.apache.isis.core.metamodel.facets.object.bookmarkable.BookmarkPolicyFacet;
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -418,6 +419,10 @@ public class EntityModel extends BookmarkableModel<ObjectAdapter> {
final ObjectAdapter adapter = getObjectAdapterMemento().getObjectAdapter(ConcurrencyChecking.CHECK);
for (final ScalarModel scalarModel : propertyScalarModels.values()) {
final OneToOneAssociation property = scalarModel.getPropertyMemento().getProperty();
+ if(property.containsDoOpFacet(NotPersistedFacet.class)) {
+ // ignore derived properties
+ continue;
+ }
final ObjectAdapter associate = scalarModel.getObject();
property.set(adapter, associate);
}