morciuch 2003/03/19 15:03:23
Modified: docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/portlets
PortletUpdateAction.java
webapp/WEB-INF/templates/vm/portlets/html browser-portlet.vm
portlet-info-form.vm
xdocs changes.xml
Log:
Fixed issue with adding new portlet via the portlet browser, patch by Jeremy Ford
(see Bugzilla issue# 17903)
Revision Changes Path
1.118 +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.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- changes.html 18 Mar 2003 20:06:26 -0000 1.117
+++ changes.html 19 Mar 2003 23:03:22 -0000 1.118
@@ -133,6 +133,9 @@
</li>
-->
<li>
+ Fixed - Bug # 17903 - 2003/03/19 - Fixed issue with adding new portlet via the
portlet browser, patch by Jeremy Ford (MO)
+</li>
+<li>
Fixed - Bug # 18121 - 2003/03/18 - Fixed 'war_release' target to exclude .class
files from the .war file (MO)
</li>
<li>
1.2 +8 -4
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java
Index: PortletUpdateAction.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/portlets/PortletUpdateAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PortletUpdateAction.java 4 Mar 2003 17:39:41 -0000 1.1
+++ PortletUpdateAction.java 19 Mar 2003 23:03:22 -0000 1.2
@@ -226,21 +226,25 @@
//need to build media index before add media
portletEntry.listMediaTypes();
portletEntry.addMediaType(mediaType);
- portletEntry.setClassname(className);
+
+ if (className != null && className.length() > 0)
+ {
+ portletEntry.setClassname(className);
+ }
portletEntry.setApplication(isApplication);
portletEntry.setCachedOnURL(isCachedOnURL);
portletEntry.setHidden(isHidden);
//portletEntry.
- if (newSecurityParent != null)
+ if (newSecurityParent != null && newSecurityParent.length() > 0)
{
SecurityReference securityRef = new BaseSecurityReference();
securityRef.setParent(newSecurityParent);
portletEntry.setSecurityRef(securityRef);
}
- if (newSecurityRole != null)
+ if (newSecurityRole != null && newSecurityRole.length() > 0)
{
BaseSecurity securityRole = new BaseSecurity();
securityRole.setRole(newSecurityRole);
1.4 +1 -1
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-portlet.vm
Index: browser-portlet.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/browser-portlet.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- browser-portlet.vm 4 Mar 2003 17:39:42 -0000 1.3
+++ browser-portlet.vm 19 Mar 2003 23:03:22 -0000 1.4
@@ -19,7 +19,7 @@
#end
</td>
<td>
- <a style="font-size:10"
href="$jslink.setPaneByName("PortletForm").addQueryData("mode","update").addQueryData("portlet_name",
$!entry.Name)">Update</a>
+ <a style="font-size:10"
href="$jslink.setPaneByName("PortletForm").addQueryData("mode","update").addQueryData("portlet_name",
$!entry.Name)">Edit</a>
</td>
<td>
<a style="font-size:10"
href="$jslink.setPaneByName("PortletForm").addQueryData("mode","delete").addQueryData("portlet_name",
$!entry.Name)">Delete</a>
1.2 +2 -16
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-info-form.vm
Index: portlet-info-form.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/portlet-info-form.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portlet-info-form.vm 4 Mar 2003 17:39:42 -0000 1.1
+++ portlet-info-form.vm 19 Mar 2003 23:03:22 -0000 1.2
@@ -15,23 +15,9 @@
#formReadOnlyCell ("Parent" "parent" "$!entryParent")
<!--<input type="hidden" name="parent" value="$!entry.parent"/>-->
</tr>
- <!--
<tr>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <b><font face="$ui.sansSerifFonts">Parent</font></b>
- </td>
- <td bgcolor="$!{skin.TitleBackgroundColor}">
- <font face="$ui.sansSerifFonts">
- #set($portletTypes = ["abstract", "ref", "instance"])
- <select name="portlet_type">
- #foreach($portletType in $portletTypes)
- <option value="$portletType" #if($!entry.type == $portletType)
selected="true" #end>$portletType</option>
- #end
- </select>
- </font>
- </td>
+ #formReadOnlyCell("Type" "portlet_type" "$!entry.type")
</tr>
- -->
<tr>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<b><font face="$ui.sansSerifFonts">Class Name</font></b>
@@ -107,7 +93,7 @@
</td>
<td bgcolor="$!{skin.TitleBackgroundColor}">
<font face="$ui.sansSerifFonts">
- <select name="security_ref">
+ <select name="security_role">
<option value="">None</option>
#foreach($role in $roles)
<option value="$role.name" #if($role.name ==
$entry.getSecurity().role) selected="true" #end>$role.name</option>
1.134 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- changes.xml 18 Mar 2003 20:06:26 -0000 1.133
+++ changes.xml 19 Mar 2003 23:03:22 -0000 1.134
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Fixed - Bug # 17903 - 2003/03/19 - Fixed issue with adding new portlet via the
portlet browser, patch by Jeremy Ford (MO)
+</li>
+<li>
Fixed - Bug # 18121 - 2003/03/18 - Fixed 'war_release' target to exclude .class
files from the .war file (MO)
</li>
<li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
