morciuch 2003/03/25 10:39:57
Modified: docs/site changes.html
src/java/org/apache/jetspeed/modules/actions/controls
EndCustomize.java
webapp/WEB-INF/templates/vm GlobalMacros.vm
webapp/WEB-INF/templates/vm/controllers/html
card-customize.vm column-customize.vm
flow-customize.vm multicolumn-customize.vm
row-customize.vm
webapp/WEB-INF/templates/vm/portlets/html
customizer-portletset-layout.vm
xdocs changes.xml
Log:
Fix to Psml browser error when language specific psml exists, patch by Jeremy Ford
(see Bugzilla issue# 16627)
Revision Changes Path
1.120 +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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- changes.html 25 Mar 2003 16:22:06 -0000 1.119
+++ changes.html 25 Mar 2003 18:39:56 -0000 1.120
@@ -133,6 +133,9 @@
</li>
-->
<li>
+ Fix - Bug # 16627 - 2003/03/25 - Fix to Psml browser error when language
specific psml exists, patch by Jeremy Ford (MO)
+</li>
+<li>
Fix - Bug # 17289 - 2003/03/25 - Fixed a minor bug related to the original
enhancement (MO)
</li>
<li>
1.2 +21 -9
jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/EndCustomize.java
Index: EndCustomize.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/modules/actions/controls/EndCustomize.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EndCustomize.java 8 Nov 2002 23:13:44 -0000 1.1
+++ EndCustomize.java 25 Mar 2003 18:39:56 -0000 1.2
@@ -56,6 +56,7 @@
// Turbine stuff
import org.apache.turbine.modules.Action;
+import org.apache.turbine.util.DynamicURI;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.Log;
@@ -79,29 +80,40 @@
*/
public void doPerform( RunData data ) throws Exception
{
- JetspeedLink jsLink = null;
((JetspeedRunData) data).cleanupFromCustomization();
// bring logged on user to homepage via HTTP redirect
+
try
{
- jsLink = JetspeedLinkFactory.getInstance(data);
+ JetspeedLink jsLink = JetspeedLinkFactory.getInstance(data);
+ DynamicURI duri =
jsLink.getLink(JetspeedLink.CURRENT,null,null,JetspeedLink.CURRENT,null);
String mtype = data.getParameters().getString("mtype");
if (mtype != null)
{
jsLink.setMediaType(mtype);
- jsLink.addQueryData("mtype", mtype);
+ duri = jsLink.addQueryData("mtype", mtype);
+ duri = duri.addPathInfo("media-type", mtype);
+ String language = data.getParameters().getString("language");
+ if(language != null)
+ {
+ duri = duri.addQueryData("language",language);
+ String country = data.getParameters().getString("country");
+ if(country != null)
+ {
+ duri = duri.addQueryData("country", country);
+ }
+ }
}
-
+
+ data.setRedirectURI(duri.toString());
+ JetspeedLinkFactory.putInstance(jsLink);
+ jsLink = null;
}
catch (Exception e)
{
Log.error(e);
- }
-
- data.setRedirectURI(jsLink.toString());
- JetspeedLinkFactory.putInstance(jsLink);
- jsLink = null;
+ }
}
}
1.9 +2 -0 jakarta-jetspeed/webapp/WEB-INF/templates/vm/GlobalMacros.vm
Index: GlobalMacros.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/GlobalMacros.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GlobalMacros.vm 28 Jan 2003 06:30:20 -0000 1.8
+++ GlobalMacros.vm 25 Mar 2003 18:39:56 -0000 1.9
@@ -123,6 +123,8 @@
</td>
#end
+#macro(psmlLink $baseLink)#set ($theLink = $baseLink)#set ($mtype =
$!data.Parameters.getString("mtype"))#set ($language =
$!data.Parameters.getString("language"))#set ($country =
$!data.Parameters.getString("country"))#if($!mtype)#set ($theLink =
$theLink.addQueryData("mtype", $mtype))#if($!language)#set ($theLink =
$theLink.addQueryData("language", $language))#if($!country)#set ($theLink =
$theLink.addQueryData("country", $country))#end#end#end$theLink#end
+
#* ------------------------------------------------------------------
#
# Macros that are used for portal page construction.
1.13 +3 -13
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm
Index: card-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/card-customize.vm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- card-customize.vm 2 Sep 2002 18:33:08 -0000 1.12
+++ card-customize.vm 25 Mar 2003 18:39:56 -0000 1.13
@@ -70,12 +70,7 @@
#end
</td>
<td valign="top" align="center">
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jslink.ActionKey" value="$action"> #end
<input type="hidden" name="position" value="$position" />
<input type="image" border="0" alt="Delete" src="images/close.gif"
name="eventSubmit_doDelete">
@@ -104,12 +99,7 @@
<table cellspacing="2">
<tr>
<td>
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action" > #end
<table cellspacing="2">
<tr>
1.11 +3 -13
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm
Index: column-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/column-customize.vm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- column-customize.vm 2 Sep 2002 18:33:08 -0000 1.10
+++ column-customize.vm 25 Mar 2003 18:39:56 -0000 1.11
@@ -71,12 +71,7 @@
#end
</td>
<td valign="top" align="center" >
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action"> #end
<input type="hidden" name="position" value="$position">
<input type="image" border="0" alt="$l10n.CUSTOMIZER_DELETE"
src="images/close.gif" name="eventSubmit_doDelete">
@@ -105,12 +100,7 @@
<table cellspacing="2">
<tr>
<td>
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action" > #end
<table cellspacing="2">
<tr>
1.5 +2 -12
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm
Index: flow-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/flow-customize.vm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- flow-customize.vm 23 Jul 2002 00:03:56 -0000 1.4
+++ flow-customize.vm 25 Mar 2003 18:39:56 -0000 1.5
@@ -70,12 +70,7 @@
#end
</td>
<td valign="top" align="center" >
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action"> #end
<input type="hidden" name="position" value="$position">
<input type="image" border="0" alt="$l10n.CUSTOMIZER_DELETE"
src="images/close.gif" name="eventSubmit_doDelete">
@@ -104,12 +99,7 @@
<table cellspacing="2">
<tr>
<td>
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jslink.ActionKey"
value="$action" > #end
<table cellspacing="2">
<tr>
1.16 +4 -18
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm
Index: multicolumn-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/multicolumn-customize.vm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- multicolumn-customize.vm 15 Nov 2002 17:27:18 -0000 1.15
+++ multicolumn-customize.vm 25 Mar 2003 18:39:56 -0000 1.16
@@ -21,12 +21,7 @@
#foreach ( $portlet in $column )
<tr>
<td width="100%">
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" /> #end
<input type="hidden" name="id" value="$portlet.id" />
<input type="hidden" name="col" value="$col" />
@@ -125,11 +120,7 @@
<table width="100%"> ## Including table to match alignment.
<tr>
<td>
- #if ($!mtype)
- <form name="decorations$ndx"
action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
- #else
- <form name="decorations$ndx" action="$jslink.Template"
method="post">
- #end
+ <form name="decorations$ndx" action="#psmlLink($jslink.Template)"
method="post">
#if ($action)
<input name="$jslink.ActionKey" type="hidden"
value="$action">
#end
@@ -164,12 +155,7 @@
</tr>
</table>
<br>
-#set ($mtype = $!data.Parameters.getString("mtype"))
-#if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
-#else
- <form action="$jslink.Template" method="post">
-#end
+<form action="#psmlLink($jslink.Template)" method="post">
#if ($action) <input type="hidden" name="$jslink.ActionKey" value="$action" > #end
<center>
<table cellspacing="2">
1.10 +3 -13
jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm
Index: row-customize.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/controllers/html/row-customize.vm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- row-customize.vm 2 Sep 2002 18:33:08 -0000 1.9
+++ row-customize.vm 25 Mar 2003 18:39:56 -0000 1.10
@@ -71,12 +71,7 @@
#end
</td>
<td valign="top" align="center">
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)" method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jlink.ActionKey" value="$action"> #end
<input type="hidden" name="position" value="$position">
<input type="image" border="0" alt="Delete" src="images/close.gif"
name="eventSubmit_doDelete">
@@ -105,12 +100,7 @@
<table cellspacing="2">
<tr>
<td>
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form action="$jslink.Template.addQueryData('mtype', $mtype)"
method="post">
- #else
- <form action="$jslink.Template" method="post">
- #end
+ <form action="#psmlLink($jslink.Template)" method="post">
#if ($!action) <input type="hidden" name="$jlink.ActionKey"
value="$action" > #end
<table cellspacing="2">
<tr>
1.13 +3 -17
jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm
Index: customizer-portletset-layout.vm
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/customizer-portletset-layout.vm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- customizer-portletset-layout.vm 15 Nov 2002 17:27:18 -0000 1.12
+++ customizer-portletset-layout.vm 25 Mar 2003 18:39:57 -0000 1.13
@@ -9,12 +9,7 @@
$l10n.CUSTOMIZER_LAYOUT :
</td>
<td valign="middle">
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form name="controllers" action="$jslink.Template.addQueryData('mtype',
$mtype)" method="post">
- #else
- <form name="controllers" action="$jslink.Template" method="post">
- #end
+ <form name="controllers" action="#psmlLink($jslink.Template)"
method="post">
#if ($action)
<input name="$jslink.ActionKey" type="hidden" value="$action">
#end
@@ -50,12 +45,7 @@
$l10n.CUSTOMIZER_DECORATION :
</td>
<td valign="middle">
- #set ($mtype = $!data.Parameters.getString("mtype"))
- #if ($!mtype)
- <form name="controls" action="$jslink.Template.addQueryData('mtype',
$mtype)" method="post">
- #else
- <form name="controls" action="$jslink.Template" method="post">
- #end
+ <form name="controls" action="#psmlLink($jslink.Template)" method="post">
#if ($action) <input name="$jslink.ActionKey" type="hidden"
value="$action"> #end
<input type="hidden" name="eventSubmit_doControl" value="control">
<select name="control" onChange="document.controls.submit()">
@@ -111,11 +101,7 @@
$l10n.CUSTOMIZER_SECURITY_REF :
</td>
<td valign="middle">
- #if ($!mtype)
- <form name="securityRefs" action="$jslink.Template.addQueryData('mtype',
$mtype)" method="post">
- #else
- <form name="securityRefs" action="$jslink.Template" method="post">
- #end
+ <form name="securityRefs" action="#psmlLink($jslink.Template)"
method="post">
#if ($action)
<input name="$jslink.ActionKey" type="hidden" value="$action">
#end
1.136 +4 -1 jakarta-jetspeed/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/xdocs/changes.xml,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- changes.xml 25 Mar 2003 16:22:06 -0000 1.135
+++ changes.xml 25 Mar 2003 18:39:57 -0000 1.136
@@ -23,6 +23,9 @@
</li>
-->
<li>
+ Fix - Bug # 16627 - 2003/03/25 - Fix to Psml browser error when language
specific psml exists, patch by Jeremy Ford (MO)
+</li>
+<li>
Fix - Bug # 17289 - 2003/03/25 - Fixed a minor bug related to the original
enhancement (MO)
</li>
<li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
