morciuch 2003/01/13 09:24:35
Modified: docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/portlets
CustomizeSetAction.java
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset.vm
xdocs changes.xml
Log:
Access to Add Reference button in the Customizer is now security driven defaulting
to admin-only (see Bugzilla issue# 16033)
Revision Changes Path
1.93 +3 -0 jakarta-jetspeed/docs/site/changes.html
Index: changes.html
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/docs/site/changes.html,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- changes.html 10 Jan 2003 23:06:04 -0000 1.92
+++ changes.html 13 Jan 2003 17:24:35 -0000 1.93
@@ -133,6 +133,9 @@
</li>
-->
<li>
+ Update - Bug # 16033 - 2003/01/13 - Access to Add Reference button in the
Customizer is security driven defaulting to admin-only (MO)
+</li>
+<li>
Fixed - Bug # 15595 - 2003/01/10 - Fixed problem with logging portlet access -
again and for good (MO)
</li>
<li>
1.37 +0 -5
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java
Index: CustomizeSetAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/CustomizeSetAction.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- CustomizeSetAction.java 12 Dec 2002 03:47:54 -0000 1.36
+++ CustomizeSetAction.java 13 Jan 2003 17:24:35 -0000 1.37
@@ -261,7 +261,6 @@
context.put("allowpane", "false");
- context.put("allowreference", "false");
// do not allow panes for wml profiles
if ((!mediaType.equalsIgnoreCase("wml")) && (set.getController() instanceof
PortletSetController))
@@ -274,10 +273,6 @@
else
{
context.put("allowportlet", "true");
- if (JetspeedSecurity.hasRole(rundata.getUser().getUserName(),
JetspeedSecurity.JETSPEED_ROLE_ADMIN))
- {
- context.put("allowreference", "true");
- }
}
//
--------------------------------------------------------------------------
1.15 +2 -2
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm
Index: customizer-portletset.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset.vm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- customizer-portletset.vm 12 Dec 2002 03:48:30 -0000 1.14
+++ customizer-portletset.vm 13 Jan 2003 17:24:35 -0000 1.15
@@ -43,7 +43,7 @@
<form action="$jslink.Template" method="post">
#end
- #if ($allowreference=="true")
+ #if ($allowportlet=="true")
$jetspeed.getPortletParameter($data, $customizer, "addRef",
$l10n.CUSTOMIZER_ADDREFERENCE)
#else
$jetspeed.getPortletParameter($data, $customizer, "addRefDisabled",
$l10n.CUSTOMIZER_ADDREFERENCE)
@@ -91,4 +91,4 @@
</tr>
#end
</table>
-#parse ($feature)
\ No newline at end of file
+#parse ($feature)
1.110 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- changes.xml 10 Jan 2003 23:06:05 -0000 1.109
+++ changes.xml 13 Jan 2003 17:24:35 -0000 1.110
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Update - Bug # 16033 - 2003/01/13 - Access to Add Reference button in the
Customizer is security driven defaulting to admin-only (MO)
+</li>
+<li>
Fixed - Bug # 15595 - 2003/01/10 - Fixed problem with logging portlet access -
again and for good (MO)
</li>
<li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
