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/14 17:12:42 UTC

[1/4] isis git commit: ISIS-1615: prevent bootstrap from changing the HTML link's 'title' attribute on client-side

Repository: isis
Updated Branches:
  refs/heads/master fe434278d -> 34489731f


ISIS-1615: prevent bootstrap from changing the HTML link's 'title' attribute on client-side 

see https://issues.apache.org/jira/browse/ISIS-1615

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

Branch: refs/heads/master
Commit: 9d2aea00ee9db082de56d0e8035c5a9cc1bd2880
Parents: de83e6e
Author: Andi Huber <ho...@gmx.at>
Authored: Sat May 13 19:52:42 2017 +0200
Committer: GitHub <no...@github.com>
Committed: Sat May 13 19:52:42 2017 +0200

----------------------------------------------------------------------
 .../components/actionmenu/entityactions/AdditionalLinksPanel.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/9d2aea00/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 be3e492..9fa1584 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
@@ -108,6 +108,8 @@ public class AdditionalLinksPanel extends PanelAbstract<ListOfLinksModel> {
                 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 
+                    link.add(new AttributeAppender("data-selector", "true"));
                 }
 
                 final Label viewTitleLabel = new Label(ID_ADDITIONAL_LINK_TITLE, linkAndLabel.getLabel());


[2/4] isis git commit: ISIS-1615: updates simpleapp to demonstrate the issue

Posted by da...@apache.org.
ISIS-1615: updates simpleapp to demonstrate the issue


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

Branch: refs/heads/master
Commit: f9cca94b83fa78c130718b2d8726b7226db7b14f
Parents: fe43427
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 14 18:06:47 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 14 18:06:47 2017 +0100

----------------------------------------------------------------------
 .../modules/simple/dom/impl/SimpleObject.layout.xml          | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/f9cca94b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
index b995607..00c97fa 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObject.layout.xml
@@ -31,9 +31,13 @@
                     <bs3:row>
                         <bs3:col span="12">
                             <c:fieldSet name="Name">
-                                <c:action id="delete"/>
+                                <c:action id="delete">
+                                    <c:describedAs>Deletes this object from the persistent datastore</c:describedAs>
+                                </c:action>
                                 <c:property id="name" namedEscaped="true">
-                                    <c:action id="updateName"/>
+                                    <c:action id="updateName">
+                                        <c:describedAs>Updates the object's name</c:describedAs>
+                                    </c:action>
                                 </c:property>
                                 <c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
                             </c:fieldSet>


[3/4] isis git commit: Merge branch 'patch-2' of https://github.com/hobrom/isis into ISIS-1615_pr-77

Posted by da...@apache.org.
Merge branch 'patch-2' of https://github.com/hobrom/isis into ISIS-1615_pr-77


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

Branch: refs/heads/master
Commit: 8669d92cdde650f1f7668aa67961906ea7c5e85e
Parents: f9cca94 9d2aea0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 14 18:07:44 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 14 18:07:44 2017 +0100

----------------------------------------------------------------------
 .../components/actionmenu/entityactions/AdditionalLinksPanel.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------



[4/4] isis git commit: Merge branch 'ISIS-1615_pr-77'

Posted by da...@apache.org.
Merge branch 'ISIS-1615_pr-77'


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

Branch: refs/heads/master
Commit: 34489731f182aa77e115f6e74eff9fe81237a663
Parents: f9cca94 8669d92
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sun May 14 18:08:28 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sun May 14 18:08:28 2017 +0100

----------------------------------------------------------------------
 .../components/actionmenu/entityactions/AdditionalLinksPanel.java  | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------