gatein SVN: r7999 - epp/portal/branches/EPP_5_2_Branch/distribution.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-07 07:22:09 -0500 (Mon, 07 Nov 2011)
New Revision: 7999
Modified:
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
Log:
JBEPP-1347 Upgrade SSO component to 1.1.0-GA
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-11-07 11:23:42 UTC (rev 7998)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-11-07 12:22:09 UTC (rev 7999)
@@ -19,7 +19,7 @@
<epp.dir>jboss-epp-5.2</epp.dir>
<maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
- <sso.version>1.1.0-Beta02</sso.version>
+ <sso.version>1.1.0-GA</sso.version>
<portletbridge.version>2.2.0.GA.EPP520</portletbridge.version>
<!-- portlet bridge directory - not used, distribution module name is used as directory name -->
13 years, 1 month
gatein SVN: r7997 - components/sso/tags.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-11-07 06:12:13 -0500 (Mon, 07 Nov 2011)
New Revision: 7997
Added:
components/sso/tags/1.1.0-GA/
Removed:
components/sso/tags/sso-parent-1.1.0-GA/
Log:
Rename tag
13 years, 1 month
gatein SVN: r7996 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui and 6 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-11-07 05:35:02 -0500 (Mon, 07 Nov 2011)
New Revision: 7996
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationCategory.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationInfo.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl
portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardSelectContainer.java
portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java
Log:
GTNPORTAL-1990 NPE if an ApplicationCategory doesn't have a display name
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationCategory.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationCategory.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/ApplicationCategory.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -58,6 +58,20 @@
public String getDisplayName()
{
+ return getDisplayName(false);
+ }
+
+ /**
+ * Return display name <br/>
+ * If it's null or empty and checkEmpty is true, return name instead
+ * @param checkEmpty
+ */
+ public String getDisplayName(boolean checkEmpty)
+ {
+ if (checkEmpty && (displayName == null || displayName.trim().length() == 0))
+ {
+ return getName();
+ }
return displayName;
}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -47,7 +47,7 @@
public int compare(ApplicationCategory cate1, ApplicationCategory cate2)
{
- return cate1.getDisplayName().compareToIgnoreCase(cate2.getDisplayName());
+ return cate1.getDisplayName(true).compareToIgnoreCase(cate2.getDisplayName(true));
}
}
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategoryForm.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -136,15 +136,9 @@
UIFormInputSet uiSetting = uiForm.getChildById(FIELD_SETTING);
UIFormInputSet uiPermission = uiForm.getChildById(FIELD_PERMISSION);
category.setName(uiSetting.getUIStringInput(FIELD_NAME).getValue());
- String displayName = uiSetting.getUIStringInput(FIELD_DISPLAY_NAME).getValue();
- if (displayName == null || displayName.length() < 1)
- {
- category.setDisplayName(category.getName());
- }
- else
- {
- category.setDisplayName(displayName);
- }
+ String displayName = uiSetting.getUIStringInput(FIELD_DISPLAY_NAME).getValue();
+ category.setDisplayName(displayName);
+
category.setDescription(uiSetting.getUIFormTextAreaInput(FIELD_DESCRIPTION).getValue());
UIListPermissionSelector uiListPermissionSelector = uiPermission.getChild(UIListPermissionSelector.class);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -94,7 +94,7 @@
defaultValue = appRegService.getApplication(category.getName(), definitionName) != null;
}
checkBoxInput = new UIFormCheckBoxInput<Boolean>("category_" + category.getName(), null, defaultValue);
- uiInfo = new UIFormInputInfo("categoryName", null, encoder.encode(category.getDisplayName()));
+ uiInfo = new UIFormInputInfo("categoryName", null, encoder.encode(category.getDisplayName(true)));
uiInputSet.addChild(checkBoxInput);
uiInputSet.addChild(uiInfo);
uiTableInputSet.addChild(uiInputSet);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIGadgetInfo.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -95,7 +95,7 @@
{
if (appRegService.getApplication(category.getName(), gadget_.getName()) != null)
{
- nameList.add(category.getDisplayName());
+ nameList.add(category.getDisplayName(true));
}
}
StringBuffer names = new StringBuffer("");
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UIPortletInfo.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -106,7 +106,7 @@
{
if (application.getContentId().equals(portlet_.getId()))
{
- nameList.add(category.getDisplayName());
+ nameList.add(category.getDisplayName(true));
}
}
}
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationInfo.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationInfo.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationInfo.gtmpl 2011-11-07 10:35:02 UTC (rev 7996)
@@ -9,7 +9,7 @@
EntityEncoder encoder = HTMLEntityEncoder.getInstance();
-String categoryDisplayName = encoder.encode(category.getDisplayName());
+String categoryDisplayName = encoder.encode(category.getDisplayName(true));
String applicationDisplayName = encoder.encode(application.getDisplayName());
String applicationDescription = encoder.encode(application.getDescription());
%>
@@ -17,7 +17,7 @@
<div class="UIBreadcumb">
<div class="ControlIcon EditIcon" title="<%=_ctx.appRes("UIApplicationInfo.title.editApplication")%>" onclick="<%= uicomponent.event("EditApplication") %>"><span></span></div>
<div class="BreadcumbInfo">
- <div class="LeftBlock" title="<%= category.getDisplayName() %>"><%= categoryDisplayName %></div>
+ <div class="LeftBlock" title="<%= category.getDisplayName(true) %>"><%= categoryDisplayName %></div>
<div class="RightBlackGridArrow16x16Icon"><span></span></div>
<div class="Selected" title="<%= application.getDisplayName() %> "><%= applicationDisplayName %></div>
</div>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/applicationregistry/webui/component/UIApplicationOrganizer.gtmpl 2011-11-07 10:35:02 UTC (rev 7996)
@@ -28,8 +28,7 @@
boolean isSelected = false;
for(category in categories) {
cName = category.getName();
- displayName =category.getDisplayName();
- if(displayName == null || displayName.length() < 1 ) displayName = cName;
+ displayName =category.getDisplayName(true);
EntityEncoder encoder = HTMLEntityEncoder.getInstance();
displayName = encoder.encode(displayName);
if(selectedCategory != null && cName == selectedCategory.getName()) {
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIApplicationList.gtmpl 2011-11-07 10:35:02 UTC (rev 7996)
@@ -19,8 +19,7 @@
boolean isSelected = false;
for(category in categories) {
cName = category.getName();
- displayName = encoder.encode(category.getDisplayName());
- if (displayName == null || displayName.length() < 1 ) displayName = cName;
+ displayName = encoder.encode(category.getDisplayName(true));
if (selectedCategory != null && cName == selectedCategory.getName()) {
isSelected = true;
cTab = "SelectedTab";
Modified: portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardSelectContainer.java
===================================================================
--- portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardSelectContainer.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardSelectContainer.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -89,7 +89,7 @@
{
public int compare(ApplicationCategory cate1, ApplicationCategory cate2)
{
- return cate1.getDisplayName().compareToIgnoreCase(cate2.getDisplayName());
+ return cate1.getDisplayName(true).compareToIgnoreCase(cate2.getDisplayName(true));
}
});
categories = listCategories;
Modified: portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl
===================================================================
--- portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/webui/dashboard/src/main/resources/groovy/dashboard/webui/component/UIDashboardSelectContainer.gtmpl 2011-11-07 10:35:02 UTC (rev 7996)
@@ -25,8 +25,8 @@
<% List categories = uicomponent.getCategories();
if(categories != null && categories.size() > 0){
for(category in categories){
- String categoryName = category.getDisplayName();
- categoryName = categoryName == null ? "" : encoder.encode(categoryName);
+ String categoryName = category.getDisplayName(true);
+ categoryName = encoder.encode(categoryName);
%>
<div class="GadgetCategory" id="${category.getName()}">
<div class="GadgetTab SelectedTab" onclick="eXo.webui.UIDashboard.onTabClick(this, 'NormalTab', 'SelectedTab')">
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java 2011-11-07 08:48:21 UTC (rev 7995)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIApplicationList.java 2011-11-07 10:35:02 UTC (rev 7996)
@@ -150,7 +150,7 @@
{
public int compare(ApplicationCategory p_1, ApplicationCategory p_2)
{
- return p_1.getDisplayName().compareToIgnoreCase(p_2.getDisplayName());
+ return p_1.getDisplayName(true).compareToIgnoreCase(p_2.getDisplayName(true));
}
};
13 years, 1 month
gatein SVN: r7995 - in portal/trunk: portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component and 3 other directories.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-11-07 03:48:21 -0500 (Mon, 07 Nov 2011)
New Revision: 7995
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
Log:
GTNPORTAL-1927 Menu items for navigation nodes which don't lead to any page shouldn't be clickable
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UINavigationNodeSelector.java 2011-11-07 08:48:21 UTC (rev 7995)
@@ -460,31 +460,31 @@
}
}
- static public class EditPageNodeActionListener extends EventListener<UIRightClickPopupMenu>
+ static public class EditPageNodeActionListener extends BaseActionListener<UIRightClickPopupMenu>
{
public void execute(Event<UIRightClickPopupMenu> event) throws Exception
{
- // get nodeID
+ UIPortalApplication uiApp = Util.getUIPortalApplication();
+ UIRightClickPopupMenu popupMenu = event.getSource();
+ UINavigationNodeSelector uiNodeSelector = popupMenu.getAncestorOfType(UINavigationNodeSelector.class);
+
String nodeID = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
-
- // get UINavigationNodeSelector
- UIRightClickPopupMenu uiPopupMenu = event.getSource();
- UINavigationNodeSelector uiNodeSelector = uiPopupMenu.getAncestorOfType(UINavigationNodeSelector.class);
-
- // get Selected Node
- TreeNode selectedPageNode = uiNodeSelector.findNode(nodeID);
-
- UIPortalApplication uiApp = Util.getUIPortalApplication();
- if (selectedPageNode == null || selectedPageNode.getPageRef() == null)
+ TreeNode node = uiNodeSelector.findNode(nodeID);
+ try
{
- uiApp.addMessage(new ApplicationMessage("UIPageNodeSelector.msg.notAvailable", null));
+ node = rebaseNode(node, uiNodeSelector);
+ if (node == null) return;
+ }
+ catch (NavigationServiceException ex)
+ {
+ handleError(ex.getError(), uiNodeSelector);
return;
- }
+ }
UserPortalConfigService userService = uiNodeSelector.getApplicationComponent(UserPortalConfigService.class);
// get selected page
- String pageId = selectedPageNode.getPageRef();
+ String pageId = node.getPageRef();
Page selectPage = (pageId != null) ? userService.getPage(pageId) : null;
if (selectPage != null)
{
@@ -518,7 +518,7 @@
UIPage uiPage = (UIPage)uiToolPanel.getUIComponent();
if (selectPage.getTitle() == null)
- selectPage.setTitle(selectedPageNode.getLabel());
+ selectPage.setTitle(node.getLabel());
// convert Page to UIPage
PortalDataMapper.toUIPage(uiPage, selectPage);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
@@ -70,7 +70,7 @@
if(node.pageRef != null) {
print """<a class="ItemIcon $icon" href="$href" $title>$label</a>""";
} else {
- print """<a class="ItemIcon $icon" href="#" $title>$label</a>""";
+ print """<a class="ItemIcon $icon" onclick='eXo.portal.UIPortalNavigation.cancelHideMenuContainer(event)' $title>$label</a>""";
}
if(hasChild) {
print """
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
@@ -71,7 +71,7 @@
if(node.pageRef != null) {
print """<a class="ItemIcon $icon" href="$actionLink" $title>$label</a>""";
} else {
- print """<a class="ItemIcon $icon" href="#" $title>$label</a>""";
+ print """<a class="ItemIcon $icon" onclick='eXo.portal.UIPortalNavigation.cancelHideMenuContainer(event)' $title>$label</a>""";
}
if(hasChild) {
print """
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
@@ -108,7 +108,7 @@
if(node.pageRef != null) {
print """<a class="ItemIcon $icon" href="$href" $title>$label</a>""";
} else {
- print """<a class="ItemIcon $icon" href="#" $title>$label</a>""";
+ print """<a class="ItemIcon $icon" onclick='eXo.portal.UIPortalNavigation.cancelHideMenuContainer(event)' $title>$label</a>""";
}
print """
Modified: portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-11-07 08:48:21 UTC (rev 7995)
@@ -58,16 +58,21 @@
label = label.substring(0,37) + "...";
}
- def actionLink = "#";
+ print """
+ <li class="MenuItem $tabStyleNavigation $arrowIcon" title="$title" $getNodeURL>
+ """;
if(node.getPageRef() != null) {
nodeURL.setNode(node);
nodeURL.setAjax(uicomponent.isUseAjax());
- actionLink = nodeURL.toString();
- }
- print """
- <li class="MenuItem $tabStyleNavigation $arrowIcon" title="$title" $getNodeURL>
- <a class="ItemIcon $icon" href="$actionLink">$label</a>
- """;
+ def actionLink = nodeURL.toString();
+ print """
+ <a class="ItemIcon $icon" href="$actionLink">$label</a>
+ """;
+ } else {
+ print """
+ <a class="ItemIcon $icon" onclick='eXo.portal.UIPortalNavigation.cancelHideMenuContainer(event)'>$label</a>
+ """;
+ }
if (node.getChildren().size() > 0) {
renderChildrenContainer(node, nodeURL);
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortalNavigation.js 2011-11-07 08:48:21 UTC (rev 7995)
@@ -291,7 +291,13 @@
}
};
-UIPortalNavigation.prototype.cancelHideMenuContainer = function() {
+UIPortalNavigation.prototype.cancelHideMenuContainer = function(evt) {
+ if (evt && evt.stopPropagation) {
+ evt.stopPropagation();
+ } else if (window.event) {
+ window.event.cancelBubble = true;
+ }
+
if (this.hideMenuTimeoutId) {
window.clearTimeout(this.hideMenuTimeoutId) ;
}
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-11-07 08:02:35 UTC (rev 7994)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2011-11-07 08:48:21 UTC (rev 7995)
@@ -478,7 +478,7 @@
#############################################################################
UIPageNodeSelector.UIDropDown.title=Select Navigations
-UIPageNodeSelector.msg.notAvailable=The page of this node is not available.
+UIPageNodeSelector.msg.notAvailable=This node doesn't point to any page or the page has been deleted
UIPageNodeSelector.msg.Invalid-editPermission=You have not the rights to edit this page
UIPageNodeSelector.msg.deleteNav=You can not delete this page navigation.
UIPageNodeSelector.msg.NoPageNavigation=You must create a navigation before you can use this function.
13 years, 1 month
gatein SVN: r7994 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui.
by do-not-reply＠jboss.org
Author: phuong_vu
Date: 2011-11-07 03:02:35 -0500 (Mon, 07 Nov 2011)
New Revision: 7994
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java
Log:
GTNPORTAL-2249 Exception when opening Application Registry portlet
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java 2011-11-07 06:54:59 UTC (rev 7993)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/Util.java 2011-11-07 08:02:35 UTC (rev 7994)
@@ -57,7 +57,17 @@
public int compare(Application app1, Application app2)
{
- return app1.getDisplayName().compareToIgnoreCase(app2.getDisplayName());
+ String firstDisplayName = app1.getDisplayName();
+ if(firstDisplayName == null)
+ {
+ firstDisplayName = "";
+ }
+ String secondDisplayName = app2.getDisplayName();
+ if(secondDisplayName == null)
+ {
+ secondDisplayName = "";
+ }
+ return firstDisplayName.compareToIgnoreCase(secondDisplayName);
}
}
@@ -67,7 +77,17 @@
public int compare(Gadget gadget1, Gadget gadget2)
{
- return gadget1.getTitle().compareToIgnoreCase(gadget2.getTitle());
+ String firstTitle = gadget1.getTitle();
+ if(firstTitle == null)
+ {
+ firstTitle = "";
+ }
+ String secondTitle = gadget2.getTitle();
+ if(secondTitle == null)
+ {
+ secondTitle = "";
+ }
+ return firstTitle.compareToIgnoreCase(secondTitle);
}
}
13 years, 1 month
gatein SVN: r7992 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-11-07 01:34:26 -0500 (Mon, 07 Nov 2011)
New Revision: 7992
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
Log:
GTNPORTAL-2261 Exception when add over 10 user into group
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2011-11-07 03:32:25 UTC (rev 7991)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2011-11-07 06:34:26 UTC (rev 7992)
@@ -20,6 +20,7 @@
package org.exoplatform.organization.webui.component;
import org.exoplatform.commons.utils.EmptySerializablePageList;
+import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.commons.utils.PageList;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.services.organization.Group;
@@ -133,7 +134,9 @@
{
OrganizationService service = getApplicationComponent(OrganizationService.class);
MembershipHandler handler = service.getMembershipHandler();
- pageList = new FindMembershipByGroupPageList(group.getId(), handler.findAllMembershipsByGroup(group).getSize());
+ ListAccess<?> list = handler.findAllMembershipsByGroup(group);
+ pageList = new FindMembershipByGroupPageList(group.getId(),
+ list.getSize() > 10 ? list.getSize() : 10);
}
UIGridUser uiGrid = getChild(UIGridUser.class);
pageList.setPageSize(5);
13 years, 1 month
gatein SVN: r7991 - portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet.
by do-not-reply＠jboss.org
Author: kien_nguyen
Date: 2011-11-06 22:32:25 -0500 (Sun, 06 Nov 2011)
New Revision: 7991
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-1897 Icons for deleting application look like disabled - IE8
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-11-07 02:40:18 UTC (rev 7990)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/applicationregistry/webui/component/UIApplicationRegistryPortlet/DefaultStylesheet.css 2011-11-07 03:32:25 UTC (rev 7991)
@@ -184,8 +184,6 @@
float: right; /* orientation=lt */
float: left; /* orientation=rt */
margin: 3px;
- filter: alpha(opacity=30);
- -moz-opacity: 0.3;
}
.UIApplicationRegistryPortlet .ListItem .SelectedItem a.TabLabel {
13 years, 1 month
gatein SVN: r7990 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-11-06 21:40:18 -0500 (Sun, 06 Nov 2011)
New Revision: 7990
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
GTNPORTAL-2262 Exception when viewing Application registry portlet in view mode
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-11-07 02:36:00 UTC (rev 7989)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2011-11-07 02:40:18 UTC (rev 7990)
@@ -469,8 +469,7 @@
{
public void execute(Event<UIPortal> event) throws Exception
{
- UIPortal uiPortal = event.getSource();
- UIPortalApplication application = uiPortal.getAncestorOfType(UIPortalApplication.class);
+ UIPortalApplication application = Util.getUIPortalApplication();
UIPortalComposer composer = application.findFirstComponentOfType(UIPortalComposer.class);
UITabPane uiTabPane = composer.getChild(UITabPane.class);
String appListId = uiTabPane.getChild(UIApplicationList.class).getId();
13 years, 1 month
gatein SVN: r7989 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-11-06 21:36:00 -0500 (Sun, 06 Nov 2011)
New Revision: 7989
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
Log:
GTNPORTAL-2261 Exception when add over 10 user into group
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2011-11-07 02:26:05 UTC (rev 7988)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInGroup.java 2011-11-07 02:36:00 UTC (rev 7989)
@@ -133,7 +133,7 @@
{
OrganizationService service = getApplicationComponent(OrganizationService.class);
MembershipHandler handler = service.getMembershipHandler();
- pageList = new FindMembershipByGroupPageList(group.getId(), 10);
+ pageList = new FindMembershipByGroupPageList(group.getId(), handler.findAllMembershipsByGroup(group).getSize());
}
UIGridUser uiGrid = getChild(UIGridUser.class);
pageList.setPageSize(5);
13 years, 1 month