You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2013/02/13 21:25:02 UTC

[1/2] git commit: ISIS-133: added a patch to detect and persist transient fields

ISIS-133: added a patch to detect and persist transient fields


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5ee893a5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5ee893a5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5ee893a5

Branch: refs/heads/master
Commit: 5ee893a587403b295c6f58378770943c8a3ff010
Parents: 8c63f82
Author: Kevin Meyer <ke...@apache.org>
Authored: Wed Feb 13 21:16:40 2013 +0100
Committer: Kevin Meyer <ke...@apache.org>
Committed: Wed Feb 13 21:17:05 2013 +0100

----------------------------------------------------------------------
 .../org/apache/isis/viewer/html/task/EditTask.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/5ee893a5/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
----------------------------------------------------------------------
diff --git a/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/task/EditTask.java b/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
index f9c1125..3a2649d 100644
--- a/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
+++ b/component/viewer/html/impl/src/main/java/org/apache/isis/viewer/html/task/EditTask.java
@@ -24,7 +24,6 @@ import java.util.List;
 import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.core.commons.authentication.AuthenticationSession;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.adapter.ResolveState;
 import org.apache.isis.core.metamodel.adapter.util.AdapterUtils;
 import org.apache.isis.core.metamodel.consent.Consent;
 import org.apache.isis.core.metamodel.facets.maxlen.MaxLengthFacet;
@@ -188,6 +187,9 @@ public class EditTask extends Task {
                     final ObjectAdapter currentAdapter = oneToOneAssociation.get(targetAdapter);
                     final Object currentPojo = AdapterUtils.unwrap(currentAdapter);
                     if (currentAdapter == null || currentPojo == null || !currentPojo.equals(entryPojo)) {
+                        if (entryAdapter.isTransient()){ 
+                            getPersistenceSession().makePersistent(entryAdapter);
+                        }
                         oneToOneAssociation.setAssociation(targetAdapter, entryAdapter);
                     }
                 }