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/05/16 17:33:21 UTC

[2/2] isis git commit: ISIS-1613: ensures changes applied correctly for view models (if reusing page)

ISIS-1613: ensures changes applied correctly for view models (if reusing page)

Also:
- ensure that the date fields always show the correct value (make the model live, not a snapshot)
- similar change for button's disabled text, though only partly implemented.


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

Branch: refs/heads/master
Commit: 3b85e88f178fc7ca2b21b2f0f687285bc59c919c
Parents: 9f30498
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 16 18:25:03 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 16 18:25:03 2017 +0100

----------------------------------------------------------------------
 .../entityactions/AdditionalLinksPanel.java     | 23 ++++++++++++--------
 .../ScalarPanelTextFieldDatePickerAbstract.java | 18 +++++++++------
 .../wicket/ui/panels/FormExecutorAbstract.java  |  9 ++++++++
 3 files changed, 34 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/3b85e88f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
index 4ebfa0a..f68dcfd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/entityactions/AdditionalLinksPanel.java
@@ -23,13 +23,14 @@ import java.util.List;
 
 import com.google.common.base.Strings;
 
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.AbstractLink;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.model.Model;
 
 import org.apache.isis.applib.annotation.SemanticsOf;
 import org.apache.isis.core.commons.lang.StringExtensions;
@@ -105,14 +106,18 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
 
                 final AbstractLink link = linkAndLabel.getLink();
 
-                final String itemTitle = first(linkAndLabel.getDisabledReasonIfAny(), linkAndLabel.getDescriptionIfAny());
-                if(itemTitle != null) {
-                    item.add(new AttributeAppender("title", itemTitle));
-
-                    // ISIS-1615, prevent bootstrap from changing the HTML link's 'title' attribute on client-side;
-                    // bootstrap will not touch the 'title' attribute once the HTML link has a 'data-original-title' attribute
-                    link.add(new AttributeAppender("data-original-title", ""));
-                }
+                item.add(new AttributeModifier("title",  new Model<String>() {
+                    @Override
+                    public String getObject() {
+                        // TODO: for this to update immediately, need to pass through the ActionMemento etc
+                        // (rather than reifying into LinkAndLabel)
+                        return first(linkAndLabel.getDisabledReasonIfAny(), linkAndLabel.getDescriptionIfAny());
+                    }
+                }));
+
+                // ISIS-1615, prevent bootstrap from changing the HTML link's 'title' attribute on client-side;
+                // bootstrap will not touch the 'title' attribute once the HTML link has a 'data-original-title' attribute
+                link.add(new AttributeModifier("data-original-title", ""));
 
                 final Label viewTitleLabel = new Label(ID_ADDITIONAL_LINK_TITLE, linkAndLabel.getLabel());
                 if(linkAndLabel.isBlobOrClob()) {

http://git-wip-us.apache.org/repos/asf/isis/blob/3b85e88f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 619b843..1b10b83 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -99,13 +99,17 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
     }
 
     protected IModel<String> obtainPromptInlineLinkModel() {
-        ObjectAdapter object = scalarModel.getObject();
-        final T value = object != null ? (T) object.getObject() : null;
-        final String str =
-                value != null
-                        ? converter.convertToString(value, getLocaleProvider().getLocale())
-                        : null;
-        return Model.of(str);
+        return new Model<String>() {
+            @Override public String getObject() {
+                ObjectAdapter object = scalarModel.getObject();
+                final T value = object != null ? (T) object.getObject() : null;
+                final String str =
+                        value != null
+                                ? converter.convertToString(value, getLocaleProvider().getLocale())
+                                : null;
+                return str;
+            }
+        };
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/isis/blob/3b85e88f/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
index d20c75d..c03d64a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/FormExecutorAbstract.java
@@ -141,6 +141,15 @@ public abstract class FormExecutorAbstract<M extends BookmarkableModel<ObjectAda
                 forwardOntoResult(resultAdapter, targetIfAny);
 
             } else {
+
+                // in this branch the result must be same "logical" object as target, but
+                // the OID might have changed if a view model.
+                final ObjectAdapter targetAdapter = targetEntityModel.getObject();
+                if(targetAdapter != resultAdapter) {
+                    targetEntityModel.setObject(resultAdapter);
+                    targetEntityModel.resetPropertyModels();
+                }
+
                 final AjaxRequestTarget target = targetIfAny; // only in this branch if there *is* a target to use
                 addComponentsToRedraw(target);
             }