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/04/22 17:35:35 UTC
isis git commit: ISIS-1603: adds a placeholder wicket:container for
the form
Repository: isis
Updated Branches:
refs/heads/ISIS-1603-no-xeditable 0e21012a6 -> 636f8f467
ISIS-1603: adds a placeholder wicket:container for the form
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/636f8f46
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/636f8f46
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/636f8f46
Branch: refs/heads/ISIS-1603-no-xeditable
Commit: 636f8f467c993d000c171aa464c0de86820e021f
Parents: 0e21012
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Apr 22 18:35:26 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Apr 22 18:35:26 2017 +0100
----------------------------------------------------------------------
.../ui/components/scalars/ScalarPanelTextFieldAbstract.html | 7 +++++--
.../ui/components/scalars/ScalarPanelTextFieldAbstract.java | 4 ++++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/636f8f46/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
index 8126419..098988a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
@@ -26,7 +26,7 @@
<wicket:extend>
<wicket:container wicket:id="scalarValueContainer"/>
- <div wicket:id="scalarValueEditInlineContainer">
+ <wicket:container wicket:id="scalarValueEditInlineContainer">
<a
href="#"
name="scalarValueEditInline"
@@ -34,7 +34,10 @@
wicket:id="scalarValueEditInline">
<span wicket:id="scalarValueEditInlineLabel"></span>
</a>
- </div>
+
+ <wicket:container wicket:id="propertyEditForm"/>
+
+ </wicket:container>
<wicket:fragment wicket:id="text">
<input
http://git-wip-us.apache.org/repos/asf/isis/blob/636f8f46/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 7fb331e..d74909c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -91,6 +91,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
private WebMarkupContainer scalarValueEditInlineContainer;
private WebMarkupContainer editInlineLink;
+ private WebMarkupContainer propertyEditForm;
public ScalarPanelTextFieldAbstract(final String id, final ScalarModel scalarModel, final Class<T> cls) {
super(id, scalarModel);
@@ -159,6 +160,9 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
editInlineLink.setOutputMarkupId(true);
scalarValueEditInlineContainer.add(editInlineLink);
+ propertyEditForm = new WebMarkupContainer("propertyEditForm");
+ scalarValueEditInlineContainer.add(propertyEditForm);
+
final Label editInlineLinkLabel = new Label(ID_SCALAR_VALUE_EDIT_INLINE_LABEL, textFieldModel);
editInlineLink.add(editInlineLinkLabel);