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 2014/10/24 18:03:27 UTC
[13/15] git commit: ISIS-537 AddOrReplace the menu item' label
because page refresh leads to an error that the link already has a label
ISIS-537 AddOrReplace the menu item' label because page refresh leads to an error that the link already has a label
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/45546131
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/45546131
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/45546131
Branch: refs/heads/master
Commit: 4554613129bcb524eb9b2f354b9e81971421bc02
Parents: cc2b39f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 18:08:39 2014 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Oct 24 18:08:39 2014 +0300
----------------------------------------------------------------------
.../ui/components/entity/icontitle/EntityIconAndTitlePanel.html | 2 +-
.../ui/components/widgets/cssmenu/ApplicationActionsPanel.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/45546131/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
index 29bd39f..4c919af 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.html
@@ -22,7 +22,7 @@
<wicket:panel>
<span wicket:id="entityLinkWrapper" class="entityIconAndTitlePanel entityIconAndTitleComponentType">
<a href="#" wicket:id="entityLink" class="entityUrlSource">
- <span wicket:id="entityFontAwesome"/>
+ <span wicket:id="entityFontAwesome"></span>
<img wicket:id="entityImage" class="entityImage"/>
<span wicket:id="entityTitle" class="entityTitle">[title]</span>
</a>
http://git-wip-us.apache.org/repos/asf/isis/blob/45546131/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
index 723f31f..0eac580 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
@@ -107,7 +107,7 @@ public class ApplicationActionsPanel extends Panel {
AbstractLink subMenuItemLink = menuItem.getLink();
Label menuItemLabel = new Label("menuLinkLabel", menuItem.getName());
- subMenuItemLink.add(menuItemLabel);
+ subMenuItemLink.addOrReplace(menuItemLabel);
if (!menuItem.isEnabled()) {
listItem.add(new CssClassNameAppender("disabled"));