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/09/20 22:17:28 UTC
[1/3] isis git commit: Fixes ISIS-1699 Titles of object references
not shown in collections
Repository: isis
Updated Branches:
refs/heads/master 47127c4df -> 93ca56e17
Fixes ISIS-1699 Titles of object references not shown in collections
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d17acddc
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d17acddc
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d17acddc
Branch: refs/heads/master
Commit: d17acddc7067520a4489fc4a35f1ea8c694b0975
Parents: 4912a4d
Author: hobrom <ho...@gmx.at>
Authored: Wed Sep 20 22:40:08 2017 +0200
Committer: hobrom <ho...@gmx.at>
Committed: Wed Sep 20 22:40:08 2017 +0200
----------------------------------------------------------------------
.../entity/icontitle/EntityIconAndTitlePanel.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d17acddc/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 1a9539d..14299b9 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -83,16 +83,23 @@ public class EntityIconAndTitlePanel extends PanelAbstract<ObjectAdapterModel> {
buildGui();
super.onBeforeRender();
}
-
+
private void buildGui() {
addOrReplaceLinkWrapper();
- if(getModel().isInlinePrompt()) {
+
+ if(isTitleSuppressed()) {
// bit of a hack... allows us to suppress the title using CSS
- add(new CssClassAppender("inlinePrompt"));
+ add(new CssClassAppender("inlinePrompt"));
}
setOutputMarkupId(true);
}
+
+ private boolean isTitleSuppressed() {
+ return getModel().isInlinePrompt()
+ //XXX ISIS-1699 never hide titles of object references in tables
+ && !getModel().getRenderingHint().isInTable();
+ }
private void addOrReplaceLinkWrapper() {
ObjectAdapterModel entityModel = getModel();
[3/3] isis git commit: Merge branch 'ISIS-1699_pr-93'
Posted by da...@apache.org.
Merge branch 'ISIS-1699_pr-93'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/93ca56e1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/93ca56e1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/93ca56e1
Branch: refs/heads/master
Commit: 93ca56e170fb1dc66f5be342b0ca480ef28ea1f7
Parents: 47127c4 a0a8005
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 20 23:16:29 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 20 23:16:29 2017 +0100
----------------------------------------------------------------------
.../entity/icontitle/EntityIconAndTitlePanel.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] isis git commit: Merge branch 'ISIS-1699' of
https://github.com/hobrom/isis into ISIS-1699_pr-93
Posted by da...@apache.org.
Merge branch 'ISIS-1699' of https://github.com/hobrom/isis into ISIS-1699_pr-93
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a0a80054
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a0a80054
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a0a80054
Branch: refs/heads/master
Commit: a0a800549b2b26f106ca5b22dc6bb949a7053403
Parents: 47127c4 d17acdd
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Sep 20 23:12:08 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Sep 20 23:12:08 2017 +0100
----------------------------------------------------------------------
.../entity/icontitle/EntityIconAndTitlePanel.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------