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 2016/01/09 10:10:51 UTC
[5/5] isis git commit: ISIS-993: fixed the OK/edit issue.
ISIS-993: fixed the OK/edit issue.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/873cc2e2
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/873cc2e2
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/873cc2e2
Branch: refs/heads/ISIS-993
Commit: 873cc2e2e86df4f3e43d691ef9313d03c5313745
Parents: 9ff3c29
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Jan 9 09:10:30 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Jan 9 09:10:30 2016 +0000
----------------------------------------------------------------------
.../ui/components/entity/properties/EntityPropertiesForm.java | 2 +-
.../src/main/java/domainapp/dom/simple/SimpleObject.layout.xml | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/873cc2e2/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index 1f8792a..ea35848 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -227,7 +227,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> implements
addFeedbackGui(leftColumn);
} else {
- Components.permanentlyHide(this,
+ Components.permanentlyHide(leftColumn,
ID_EDIT_BUTTON, ID_OK_BUTTON, ID_CANCEL_BUTTON,
ID_FEEDBACK);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/873cc2e2/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
index 7d4f0e4..e49e937 100644
--- a/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
+++ b/example/application/simpleapp/dom/src/main/java/domainapp/dom/simple/SimpleObject.layout.xml
@@ -13,8 +13,10 @@
</actions>
</property>
</propertyGroup>
+ <collection id="similarTo" defaultView="table"/>
</left>
<right span="6">
+ <collection id="others" defaultView="hide"/>
</right>
</tab>
<tab name="Metadata">
@@ -29,12 +31,12 @@
</left>
</tab>
</tabGroup>
+<!--
<tabGroup>
<tab name="Collections">
<left span="6">
- <collection id="similarTo" defaultView="table"/>
- <collection id="others" defaultView="hide"/>
</left>
</tab>
</tabGroup>
+-->
</objectLayout>
\ No newline at end of file