morciuch 2002/09/26 14:04:59
Modified: src/java/org/apache/jetspeed/portal/controls
VelocityPortletControl.java
Log:
Bug fix: info icon was added twice under certain security configurations (for
example, if security ref only had view, info and print_friendly permissions).
Revision Changes Path
1.22 +4 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java
Index: VelocityPortletControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/controls/VelocityPortletControl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- VelocityPortletControl.java 10 Sep 2002 15:12:08 -0000 1.21
+++ VelocityPortletControl.java 26 Sep 2002 21:04:59 -0000 1.22
@@ -231,6 +231,7 @@
PortletState state = (PortletState)portlet;
boolean customized = (jdata.getMode()==jdata.CUSTOMIZE);
boolean maximized = customized||(jdata.getMode()==jdata.MAXIMIZE);
+ boolean infoAdded = false;
if ( state.allowCustomize( rundata ) )
{
@@ -244,6 +245,7 @@
if ( state.allowInfo( rundata ) )
{
actions.add( new PortletAction("info", "Information") );
+ infoAdded = true;
}
}
@@ -252,7 +254,7 @@
actions.add( new PortletAction("print", "Print Friendly Format") );
}
- if ( (!customized) && state.allowInfo( rundata ) &&
(!actions.contains("info")) )
+ if ( (!customized) && state.allowInfo( rundata ) && (!infoAdded) )
{
actions.add( new PortletAction("info", "Information") );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
