Author: woonsan
Date: Tue Oct 19 00:48:32 2010
New Revision: 1024073
URL: http://svn.apache.org/viewvc?rev=1024073&view=rev
Log:
JS2-1223: Hiding 'Document ordering' tab when a non-folder item selected.
Actually the PSM already implemented it but it used a wrong tree item (the
existing selected item), instead of the new selected item. Fixed by using
proper selected item.
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Modified:
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java?rev=1024073&r1=1024072&r2=1024073&view=diff
==============================================================================
---
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
(original)
+++
portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/site/PortalSiteManager.java
Tue Oct 19 00:48:32 2010
@@ -332,7 +332,7 @@ public class PortalSiteManager extends A
tree.getTreeState().collapseNode(treeNode);
}
- controlTabs();
+ controlTabs(siteNode);
target.addComponent(tabPanel);
@@ -2940,10 +2940,15 @@ public class PortalSiteManager extends A
return contentType;
}
}
-
+
protected void controlTabs()
{
SiteTreeNode node = getUserSelectedNode();
+ controlTabs(node);
+ }
+
+ protected void controlTabs(final SiteTreeNode node)
+ {
TabbedPanel tabs = (TabbedPanel) get("tabs");
tabs.getTabs().clear();
ITab tempTab;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
