You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2011/04/01 18:15:24 UTC
svn commit: r1087783 - in
/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher:
context/DefaultOidObjectMapping.java view/edit/EditObject.java
Author: rmatthews
Date: Fri Apr 1 16:15:23 2011
New Revision: 1087783
URL: http://svn.apache.org/viewvc?rev=1087783&view=rev
Log:
Too much data was being added to the edit form (for transient objects).
Modified:
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java?rev=1087783&r1=1087782&r2=1087783&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/context/DefaultOidObjectMapping.java Fri Apr 1 16:15:23 2011
@@ -145,6 +145,8 @@ public class DefaultOidObjectMapping imp
LOG.debug("encoded " + oid + " as " + id + " ~ " + encodedOid);
if (isTransient) {
+ // TODO cache these in requests so that Mementos are obly created once.
+
// TODO if Transient/Interaction then return state; other store state in session an return OID string
TransientObjectMapping mapping = new TransientObjectMapping((ObjectAdapter) inObject);
if (scope == Scope.REQUEST) {
Modified: incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java?rev=1087783&r1=1087782&r2=1087783&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java (original)
+++ incubator/isis/trunk/viewer/scimpi/dispatcher/src/main/java/org/apache/isis/viewer/scimpi/dispatcher/view/edit/EditObject.java Fri Apr 1 16:15:23 2011
@@ -131,25 +131,7 @@ public class EditObject extends Abstract
hiddenFields.add(resultOverride == null ? null : new HiddenInputField("_" + RESULT_OVERRIDE, resultOverride));
hiddenFields.add(scope == null ? null : new HiddenInputField("_" + SCOPE, scope));
- if (object.isTransient()) {
- // restore transient details
- List<ObjectAssociation> objectFields = object.getSpecification().getAssociations();
- for (int i = 0; i < objectFields.size(); i++) {
- ObjectAssociation field = objectFields.get(i);
- ObjectAdapter fieldValue = field.get(object);
- if (!viewFields.contains(field)) {
- String fieldId = field.getId();
- String value = getValue(context, fieldValue);
- hiddenFields.add(new HiddenInputField(fieldId, value));
- }
-
- if (fieldValue != null && fieldValue.isTransient()) {
- String fieldId = field.getId();
- String data = context.mapObject(fieldValue, Scope.REQUEST);
- hiddenFields.add(new HiddenInputField(fieldId, data));
- }
- }
- } else {
+ if (!object.isTransient()) {
// ensure all booleans are included so the pass back TRUE if set.
List<ObjectAssociation> fields2 = object.getSpecification().getAssociations();
for (int i = 0; i < fields2.size(); i++) {
@@ -159,11 +141,9 @@ public class EditObject extends Abstract
String value = getValue(context, field.get(object));
hiddenFields.add(new HiddenInputField(fieldId, value));
}
- }
-
+ }
}
-
if (formTitle == null) {
formTitle = specification.getSingularName();
}