ktlili 2005/08/02 10:06:02 CEST
Modified files:
war/src/conf en_US.properties
war/src/java/org/jahia/clipbuilder/html/struts
TestClipperAction.java
war/src/webapp/jsp/clipbuilder/html/actions
testClipperAction.jsp
Log:
- fix bug: user default value hs to be set in test mode
Revision Changes Path
1.28 +2 -2 webclip_builder/war/src/conf/en_US.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/conf/en_US.properties.diff?r1=1.27&r2=1.28&f=h
1.5 +12 -11
webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/TestClipperAction.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/TestClipperAction.java.diff?r1=1.4&r2=1.5&f=h
1.7 +4 -1
webclip_builder/war/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/webclip_builder/war/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp.diff?r1=1.6&r2=1.7&f=h
Index: en_US.properties
===================================================================
RCS file: /home/cvs/repository/webclip_builder/war/src/conf/en_US.properties,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- en_US.properties 2 Aug 2005 06:18:09 -0000 1.27
+++ en_US.properties 2 Aug 2005 08:06:01 -0000 1.28
@@ -5,8 +5,7 @@
errors.exception = {0}
errors.message = {0}
error.input = Error input parameter
-test.param.urlMessage = {0}
-test.param.queryMessage = key_query_message
+
error.solution.client = Try to change the client.
@@ -241,6 +240,7 @@
testClipper.webBrowserSimulator.mode = Emulate user:
testClipper.webBrowserSimulator.mode.onload = whith Javascript
testClipper.webBrowserSimulator.mode.loop = whithout Javascript
+testClipper.error.parameter = Input parameter value not set
#WebBrowser
webBrowser.frame.warning = Warning
Index: TestClipperAction.java
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/java/org/jahia/clipbuilder/html/struts/TestClipperAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TestClipperAction.java 2 Aug 2005 06:18:10 -0000 1.4
+++ TestClipperAction.java 2 Aug 2005 08:06:02 -0000 1.5
@@ -155,12 +155,12 @@
int posUrl = Integer.parseInt(url);
updateQueryParamsValue(request,
SessionManager.getClipperBean(request).getUrlBean(posUrl));
- // handle input user parameter errors
+ // handle input user parameter errors
if (checkUserQueryParameters(request)) {
return actionMapping.getInputForward();
}
- // set the simulator mode
+ // set the simulator mode
SessionManager.getWebBrowserForm(request).setWebBrowserSimulatorMode(form.getWebBrowserSimulatorMode());
}
@@ -184,33 +184,33 @@
ClipperBean cBean = SessionManager.getClipperBean(request);
List urlBeanList = cBean.getUrlListBean();
- // check all params of all urls
+ // check all params of all urls
for (int i = 0; i < urlBeanList.size(); i++) {
List queryParamBeanList = cBean.getAllQueryParam(i);
- // all query param of the curertn url
+ // all query param of the curertn url
for (int j = 0; j < queryParamBeanList.size(); j++) {
QueryParamBean currentQueryBean =
(QueryParamBean) queryParamBeanList.get(j);
if (currentQueryBean.getDefaultValue() == null)
{
// Errors: param value is missing -->
add error mesasge
UrlBean uBean = (UrlBean)
cBean.getUrlBean(i);
- String urlMessage[] =
{uBean.getPosition()+":"+uBean.getAbsoluteURL()};
- ActionError urlActionMessage = new
ActionError("test.param.urlMessage",urlMessage);
+ String urlMessage[] = {"URL: " +
uBean.getPosition() + ":" + uBean.getAbsoluteURL()};
+ ActionError urlActionMessage = new
ActionError("test.param.urlMessage", urlMessage);
errors.add(null, urlActionMessage);
- String[] queryParamMessage =
{currentQueryBean.getName()};
- ActionError queryParamActionMessage
= new ActionError("test.param.urlMessage",queryParamMessage);
+ String[] queryParamMessage =
{"Parameter :" + currentQueryBean.getName()};
+ ActionError queryParamActionMessage =
new ActionError("test.param.urlMessage", queryParamMessage);
errors.add(null,
queryParamActionMessage);
- // update found Errors value
+ // update found Errors value
foundErros = true;
}
}
}
- // save all message
- saveErrors(request, errors);
+ // save all message
+ saveErrors(request, errors);
return foundErros;
}
@@ -263,6 +263,7 @@
if (values == null) {
return queryParamDefaultValue;
}
+ logger.debug("[ URL: " + uBean.getAbsoluteUrlValue() + " ]");
logger.debug("[ Request param size " + values.length + " ]");
logger.debug("[ Form param size " +
uBean.getFormParamBeanList().size() + " ]");
for (int j = 0; j < values.length; j++) {
Index: testClipperAction.jsp
===================================================================
RCS file:
/home/cvs/repository/webclip_builder/war/src/webapp/jsp/clipbuilder/html/actions/testClipperAction.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- testClipperAction.jsp 2 Aug 2005 06:18:10 -0000 1.6
+++ testClipperAction.jsp 2 Aug 2005 08:06:02 -0000 1.7
@@ -76,6 +76,7 @@
<tr>
<td>
<UL>
+ <li> <bean:write
name="testClipper.error.parameter"/> </li>
<html:messages id="error">
<LI> <bean:write name="error"/> </LI>
</html:messages>
@@ -118,7 +119,8 @@
</td>
</tr>
<logic:iterate name="testClipperForm"
property="actifFormParamsList" id="currentParam">
- <logic:equal name="currentParam" property="visibility"
value="true">
+ <!-- visible parameter-->
+ <logic:equal name="currentParam" property="visibility"
value="1">
<!-- new parameter-->
<tr>
<!-- Mapping -->
@@ -138,6 +140,7 @@
</logic:equal>
</tr>
</logic:equal>
+ <!-- hidden parameter-->
<logic:notEqual name="currentParam" property="visibility"
value="1">
<!-- new parameter-->
<!-- make the input hidden-->
