pvollenweider 2005/06/30 17:16:42 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp/include simple_form_generator_definitions.inc
simple_form_generator_display_form.inc
simple_form_generator_process_post.inc
Log:
Add displayTextAfterPostValue message
Revision Changes Path
1.1.2.4 +3 -1
corporate_portal_templates/src/view/jsp/include/simple_form_generator_definitions.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_definitions.inc.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
1.1.2.4 +218 -211
corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_display_form.inc.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
1.1.2.4 +26 -16
corporate_portal_templates/src/view/jsp/include/simple_form_generator_process_post.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/simple_form_generator_process_post.inc.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
Index: simple_form_generator_definitions.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/simple_form_generator_definitions.inc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- simple_form_generator_definitions.inc 30 Jun 2005 14:11:21 -0000
1.1.2.3
+++ simple_form_generator_definitions.inc 30 Jun 2005 15:16:42 -0000
1.1.2.4
@@ -12,7 +12,9 @@
titleKey="form.Subject" bundleKey="<%=resBundleID%>"/>
<content:declareField name="displayTextAfterPost"
title="Text to display after a post" type="BigText"
- titleKey="form.displayTextAfterPost" bundleKey="<%=resBundleID%>"/>
+ titleKey="form.displayTextAfterPost" bundleKey="<%=resBundleID%>"
+ value='<%=getResourceBundle("form.displayTextAfterPostValue",
+ "Thank you. Your form has been sent.",jData)%>'/>
<content:declareContainerList name="fields" title="List of fields">
<content:declareContainer>
Index: simple_form_generator_display_form.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/simple_form_generator_display_form.inc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- simple_form_generator_display_form.inc 30 Jun 2005 14:11:21 -0000
1.1.2.3
+++ simple_form_generator_display_form.inc 30 Jun 2005 15:16:42 -0000
1.1.2.4
@@ -1,251 +1,258 @@
<%
JahiaContainerList forms = jData.containers().getContainerList( "forms" );
-if (forms != null) {
- ContainerListBean formsBean = new ContainerListBean(forms,jParams);
- jData.gui().html().drawBeginActionMenu(formsBean ,
- null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
- Enumeration formsEnum = forms.getContainers();
- boolean isFormOK = false;
- if (! formsEnum.hasMoreElements()) {
- if ( ! "".equals(jData.gui().html().drawAddContainerLauncher( forms
)) ) {
- %>
- <a
href="javascript:<%=jData.gui().html().drawAddContainerLauncher( forms )%>">
- <img src='<%=theURL%>/images/add.gif' alt='Add form' width='11'
height='11' border='0'/>
- <content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="form.addSender"/></a>
- <%
- }
- }
- while (formsEnum.hasMoreElements()) {
- JahiaContainer form = (JahiaContainer) formsEnum.nextElement();
- ContainerBean formBean = new ContainerBean(form,jParams);
- String sender = form.getFieldValue("sender","Please insert a
sender");
- String recipients = form.getFieldValue("recipients","Please insert a
sender");
- String recipientsCC = form.getFieldValue("recipientsCC","");
- String subject = form.getFieldValue("subject","");
- JahiaPage pageRedirected = (JahiaPage)
form.getFieldObject("pageRedirected" );
- isFormOK = ! ("".equals(sender) || "".equals( recipients ));
-
- if (jData.gui().isEditMode()) {
- jData.gui().html().drawBeginActionMenu(formBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
- %>
- <strong <%if ("".equals(sender)) {
%>style="color:red;"<%}%>><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="form.sender"/>:
- </strong><%=sender%><br/>
- <strong <%if ("".equals(recipients)) {
%>style="color:red;"<%}%>><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="form.recipients"/>:
- </strong><%=recipients%><br/>
- <%
- if (! "".equals( recipientsCC )){
- %>
- <strong><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
- resourceName="form.recipientsCC"/>:
</strong><%=recipientsCC%><br/>
- <%
- }
- jData.gui().html().drawEndActionMenu(formBean ,
- null, null, true, "",
"jahiatemplates.Corporate_portal_templates",
- null, out);
+if (forHasBeenPosted) {
+ %>
+ <%=displayTextAfterPostValue%>
+ <%
+} else {
+ if (forms != null) {
+ ContainerListBean formsBean = new ContainerListBean(forms,jParams);
+ jData.gui().html().drawBeginActionMenu(formsBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
+ Enumeration formsEnum = forms.getContainers();
+ boolean isFormOK = false;
+ if (! formsEnum.hasMoreElements()) {
+ if ( ! "".equals(jData.gui().html().drawAddContainerLauncher( forms
)) ) {
+ %>
+ <a
href="javascript:<%=jData.gui().html().drawAddContainerLauncher( forms )%>">
+ <img src='<%=theURL%>/images/add.gif' alt='Add form' width='11'
height='11' border='0'/>
+ <content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="form.addSender"/></a>
+ <%
+ }
}
+ while (formsEnum.hasMoreElements()) {
+ JahiaContainer form = (JahiaContainer) formsEnum.nextElement();
+ ContainerBean formBean = new ContainerBean(form,jParams);
+ String sender = form.getFieldValue("sender","Please insert a
sender");
+ String recipients = form.getFieldValue("recipients","Please
insert a sender");
+ String recipientsCC = form.getFieldValue("recipientsCC","");
+ String subject = form.getFieldValue("subject","");
+ JahiaPage pageRedirected = (JahiaPage)
form.getFieldObject("pageRedirected" );
+ isFormOK = ! ("".equals(sender) || "".equals( recipients ));
- if (isFormOK) {
- JahiaContainerList fields = form.getContainerList( "fields" );
- if (fields != null) {
- ContainerListBean fieldsBean = new
ContainerListBean(fields,jParams);
- jData.gui().html().drawBeginActionMenu(fieldsBean , null,
- null, true,
"","jahiatemplates.Corporate_portal_templates",
- null, out);
+ if (jData.gui().isEditMode()) {
+ jData.gui().html().drawBeginActionMenu(formBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
%>
- <form method="post" action="<%=bypassUrl%>"
- name="form_<%=form.getID()%>"
id="form_<%=form.getID()%>">
- <input type="hidden" name="formId"
value="<%=form.getID()%>"/>
+ <strong <%if ("".equals(sender)) {
%>style="color:red;"<%}%>><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="form.sender"/>:
+ </strong><%=sender%><br/>
+ <strong <%if ("".equals(recipients)) {
%>style="color:red;"<%}%>><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="form.recipients"/>:
+ </strong><%=recipients%><br/>
<%
- if (! emptyMandatoryFields.isEmpty()) {
- %><strong><span
style="color:red;"><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
-
resourceName="form.fieldIsMandatory"/></span></strong><br/><br/><%
+ if (! "".equals( recipientsCC )){
+ %>
+ <strong><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+ resourceName="form.recipientsCC"/>:
</strong><%=recipientsCC%><br/>
+ <%
}
- %>
- <table>
- <%
+ jData.gui().html().drawEndActionMenu(formBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates",
+ null, out);
+ }
- Enumeration fieldsEnum = fields.getContainers();
+ if (isFormOK) {
+ JahiaContainerList fields = form.getContainerList( "fields"
);
+ if (fields != null) {
+ ContainerListBean fieldsBean = new
ContainerListBean(fields,jParams);
+ jData.gui().html().drawBeginActionMenu(fieldsBean , null,
+ null, true,
"","jahiatemplates.Corporate_portal_templates",
+ null, out);
+ %>
+ <form method="post" action="<%=bypassUrl%>"
+ name="form_<%=form.getID()%>"
id="form_<%=form.getID()%>">
+ <input type="hidden" name="formId"
value="<%=form.getID()%>"/>
+ <%
+ if (! emptyMandatoryFields.isEmpty()) {
+ %><strong><span
style="color:red;"><content:resourceBundle
resourceBundle="jahiatemplates.Corporate_portal_templates"
+
resourceName="form.fieldIsMandatory"/></span></strong><br/><br/><%
+ }
+ %>
+ <table>
+ <%
- while (fieldsEnum.hasMoreElements()) {
- JahiaContainer currentField = (JahiaContainer)
fieldsEnum.nextElement();
- ContainerBean currentFieldBean = new
ContainerBean(currentField,jParams);
- String fieldTitle =
currentField.getFieldValue("fieldTitle","");
- String isMandatoryStr =
currentField.getFieldValue("isMandatory","false");
- boolean isMandatory = "true".equals(isMandatoryStr);
- String type = currentField.getFieldValue("type","");
- String defaultValue =
currentField.getFieldValue("defaultValue","");
+ Enumeration fieldsEnum = fields.getContainers();
- %>
- <tr>
- <td>
- <%
- if (!
ResourceBundleMarker.drawMarker(resBundleID,"submitButton","").equals(type)){
- %><strong<%
- if (emptyMandatoryFields.contains(new
Integer(currentField.getID()))) {
- %> style="color:red;"<%
- }
- %>><%=fieldTitle%> <%
- if (isMandatory) {
- %> *<%
- }%>:</strong><%
- }
-
jData.gui().html().drawBeginActionMenu(currentFieldBean ,
- null, null, false, "",
- "jahiatemplates.Corporate_portal_templates",
- null, out);
- %>
- </td>
- <td>
- <%
- if
(ResourceBundleMarker.drawMarker(resBundleID,"smallTextarea","").equals(type)) {
- if (formIdStr != null) {
- String postedValue =
request.getParameter("field_" + currentField.getID());
- if (postedValue != null) {
- logger.debug("Set default value for
field [" + fieldTitle + "] to [" + postedValue + "]");
- defaultValue = postedValue;
- }
- }
- %>
- <textarea
name="field_<%=currentField.getID()%>"
- cols="40"
rows="6"><%=defaultValue%></textarea>
+ while (fieldsEnum.hasMoreElements()) {
+ JahiaContainer currentField = (JahiaContainer)
fieldsEnum.nextElement();
+ ContainerBean currentFieldBean = new
ContainerBean(currentField,jParams);
+ String fieldTitle =
currentField.getFieldValue("fieldTitle","");
+ String isMandatoryStr =
currentField.getFieldValue("isMandatory","false");
+ boolean isMandatory = "true".equals(isMandatoryStr);
+ String type = currentField.getFieldValue("type","");
+ String defaultValue =
currentField.getFieldValue("defaultValue","");
+
+ %>
+ <tr>
+ <td>
<%
- } else if
(ResourceBundleMarker.drawMarker(resBundleID,"largeTextarea","").equals(type)) {
- if (formIdStr != null) {
- String postedValue =
request.getParameter("field_" + currentField.getID());
- if (postedValue != null) {
- logger.debug("Set default value for
field [" + fieldTitle + "] to [" + postedValue + "]");
- defaultValue = postedValue;
- }
+ if (!
ResourceBundleMarker.drawMarker(resBundleID,"submitButton","").equals(type)){
+ %><strong<%
+ if (emptyMandatoryFields.contains(new
Integer(currentField.getID()))) {
+ %> style="color:red;"<%
+ }
+ %>><%=fieldTitle%> <%
+ if (isMandatory) {
+ %> *<%
+ }%>:</strong><%
}
+
jData.gui().html().drawBeginActionMenu(currentFieldBean ,
+ null, null, false, "",
+
"jahiatemplates.Corporate_portal_templates",
+ null, out);
%>
- <textarea
name="field_<%=currentField.getID()%>"
- cols="40"
rows="20"><%=defaultValue%></textarea>
+ </td>
+ <td>
<%
- } else if
(ResourceBundleMarker.drawMarker(resBundleID,"radioButtons","").equals(type)) {
- if (! "".equals(defaultValue)) {
- String[] values =
defaultValue.split(":");
- String postedValue =
request.getParameter("field_" + currentField.getID());
- for (int x=0; x<values.length; x++) {
- %>
- <input type="radio"
name="field_<%=currentField.getID()%>" value="<%=values[x]%>"
- <%
- if (postedValue != null){
- if
(values[x].equals(postedValue)) {
- %> checked="checked"<%
- }
+ if
(ResourceBundleMarker.drawMarker(resBundleID,"smallTextarea","").equals(type)) {
+ if (formIdStr != null) {
+ String postedValue =
request.getParameter("field_" + currentField.getID());
+ if (postedValue != null) {
+ logger.debug("Set default value
for field [" + fieldTitle + "] to [" + postedValue + "]");
+ defaultValue = postedValue;
}
- %>> <%=values[x]%><br/>
- <%
}
- } else {
- if (jData.gui().isEditMode()) {
- %><span style="color:red;">Default
value is
- required for this type</span><%
- }
- }
- } else if
(ResourceBundleMarker.drawMarker(resBundleID,"checkboxes","").equals(type)) {
- if (! "".equals(defaultValue)) {
- String[] postedValues =
request.getParameterValues("field_" + currentField.getID());
- Vector postedValuesVector = new Vector();
- if (postedValues != null) {
- for (int i = 0; i <
postedValues.length; i++){
-
postedValuesVector.add(postedValues[i]);
+ %>
+ <textarea
name="field_<%=currentField.getID()%>"
+ cols="40"
rows="6"><%=defaultValue%></textarea>
+ <%
+ } else if
(ResourceBundleMarker.drawMarker(resBundleID,"largeTextarea","").equals(type)) {
+ if (formIdStr != null) {
+ String postedValue =
request.getParameter("field_" + currentField.getID());
+ if (postedValue != null) {
+ logger.debug("Set default value
for field [" + fieldTitle + "] to [" + postedValue + "]");
+ defaultValue = postedValue;
}
}
- String[] values =
defaultValue.split(":");
- for (int x=0; x<values.length; x++) {
- %>
- <input type="checkbox"
name="field_<%=currentField.getID()%>" value="<%=values[x]%>"
- <%
- if
(postedValuesVector.contains(values[x])){
- %> checked="checked"<%
- }%>> <%=values[x]%><br/>
- <%
- }
- } else {
- if (jData.gui().isEditMode()) {
- %><span style="color:red;">Default
value is
- required for this type</span><%
- }
- }
- } else if
(ResourceBundleMarker.drawMarker(resBundleID,"selectBox","").equals(type)) {
- if (! "".equals(defaultValue)) {
%>
- <select
name="field_<%=currentField.getID()%>">
+ <textarea
name="field_<%=currentField.getID()%>"
+ cols="40"
rows="20"><%=defaultValue%></textarea>
<%
- String[] postedValues =
request.getParameterValues("field_" + currentField.getID());
- Vector postedValuesVector = new Vector();
- if (postedValues != null) {
- for (int i = 0; i <
postedValues.length; i++){
-
postedValuesVector.add(postedValues[i]);
+ } else if
(ResourceBundleMarker.drawMarker(resBundleID,"radioButtons","").equals(type)) {
+ if (! "".equals(defaultValue)) {
+ String[] values =
defaultValue.split(":");
+ String postedValue =
request.getParameter("field_" + currentField.getID());
+ for (int x=0; x<values.length; x++) {
+ %>
+ <input type="radio"
name="field_<%=currentField.getID()%>" value="<%=values[x]%>"
+ <%
+ if (postedValue != null){
+ if
(values[x].equals(postedValue)) {
+ %> checked="checked"<%
+ }
+ }
+ %>> <%=values[x]%><br/>
+ <%
+ }
+ } else {
+ if (jData.gui().isEditMode()) {
+ %><span
style="color:red;"><content:resourceBundle
+
resourceBundle="jahiatemplates.Corporate_portal_templates"
+
resourceName="form.defaultValueRequired"/></span><%
+ }
+ }
+ } else if
(ResourceBundleMarker.drawMarker(resBundleID,"checkboxes","").equals(type)) {
+ if (! "".equals(defaultValue)) {
+ String[] postedValues =
request.getParameterValues("field_" + currentField.getID());
+ Vector postedValuesVector = new
Vector();
+ if (postedValues != null) {
+ for (int i = 0; i <
postedValues.length; i++){
+
postedValuesVector.add(postedValues[i]);
+ }
+ }
+ String[] values =
defaultValue.split(":");
+ for (int x=0; x<values.length; x++) {
+ %>
+ <input type="checkbox"
name="field_<%=currentField.getID()%>" value="<%=values[x]%>"
+ <%
+ if
(postedValuesVector.contains(values[x])){
+ %> checked="checked"<%
+ }%>> <%=values[x]%><br/>
+ <%
+ }
+ } else {
+ if (jData.gui().isEditMode()) {
+ %><span
style="color:red;">Default value is
+ required for this
type</span><%
}
}
+ } else if
(ResourceBundleMarker.drawMarker(resBundleID,"selectBox","").equals(type)) {
+ if (! "".equals(defaultValue)) {
+ %>
+ <select
name="field_<%=currentField.getID()%>">
+ <%
+ String[] postedValues =
request.getParameterValues("field_" + currentField.getID());
+ Vector postedValuesVector = new
Vector();
+ if (postedValues != null) {
+ for (int i = 0; i <
postedValues.length; i++){
+
postedValuesVector.add(postedValues[i]);
+ }
+ }
- String[] values =
defaultValue.split(":");
- for (int x=0; x<values.length; x++) {
+ String[] values =
defaultValue.split(":");
+ for (int x=0; x<values.length; x++) {
+ %>
+ <option <%
+ if
(postedValuesVector.contains(values[x])){
+ %> selected="selected"<%
+ }%>><%=values[x]%></option>
+ <%
+ }
%>
- <option <%
- if
(postedValuesVector.contains(values[x])){
- %> selected="selected"<%
- }%>><%=values[x]%></option>
+ </select>
<%
+ } else {
+ if (jData.gui().isEditMode()) {
+ %><span
style="color:red;">Default value is
+ required for this
type</span><%
+ }
}
%>
- </select>
+
<%
- } else {
- if (jData.gui().isEditMode()) {
- %><span style="color:red;">Default
value is
- required for this type</span><%
+ } else if
(ResourceBundleMarker.drawMarker(resBundleID,"submitButton","").equals(type)) {
+ if ("".equals(defaultValue)){
+ defaultValue = "Submit";
}
- }
- %>
-
- <%
- } else if
(ResourceBundleMarker.drawMarker(resBundleID,"submitButton","").equals(type)) {
- if ("".equals(defaultValue)){
- defaultValue = "Submit";
- }
- %>
- <input type="submit"
name="field_<%=currentField.getID()%>"
- value="<%=defaultValue%>"/>
- <%
- } else {
- if (formIdStr != null) {
- String postedValue =
request.getParameter("field_" + currentField.getID());
- if (postedValue != null) {
- logger.debug("Set default value for
field [" + fieldTitle + "] to [" + postedValue + "]");
- defaultValue = postedValue;
+ %>
+ <input type="submit"
name="field_<%=currentField.getID()%>"
+ value="<%=defaultValue%>"/>
+ <%
+ } else {
+ if (formIdStr != null) {
+ String postedValue =
request.getParameter("field_" + currentField.getID());
+ if (postedValue != null) {
+ logger.debug("Set default value
for field [" + fieldTitle + "] to [" + postedValue + "]");
+ defaultValue = postedValue;
+ }
}
+ %>
+ <input type="text"
name="field_<%=currentField.getID()%>"
+ value="<%=defaultValue%>" size="80"/>
+ <%
}
%>
- <input type="text"
name="field_<%=currentField.getID()%>"
- value="<%=defaultValue%>" size="80"/>
- <%
- }
- %>
- </td>
- </tr>
+ </td>
+ </tr>
+ <%
+ }
+ %>
+ </table>
+ </form>
<%
- }
- %>
- </table>
- </form>
- <%
- jData.gui().html().drawEndActionMenu(fieldsBean , null,
- null, true,
"","jahiatemplates.Corporate_portal_templates",
- null, out);
- }
+ jData.gui().html().drawEndActionMenu(fieldsBean , null,
+ null, true,
"","jahiatemplates.Corporate_portal_templates",
+ null, out);
+ }
+ }
}
+ jData.gui().html().drawEndActionMenu(formsBean ,
+ null, null, true, "",
"jahiatemplates.Corporate_portal_templates", null, out);
}
- jData.gui().html().drawEndActionMenu(formsBean ,
- null, null, true, "", "jahiatemplates.Corporate_portal_templates",
null, out);
}
%>
\ No newline at end of file
Index: simple_form_generator_process_post.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/simple_form_generator_process_post.inc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- simple_form_generator_process_post.inc 30 Jun 2005 14:11:21 -0000
1.1.2.3
+++ simple_form_generator_process_post.inc 30 Jun 2005 15:16:42 -0000
1.1.2.4
@@ -1,5 +1,7 @@
<%
String formIdStr = request.getParameter("formId");
+boolean forHasBeenPosted = false;
+String displayTextAfterPostValue = "";
if (formIdStr != null) {
logger.debug("Form has been posted");
int formId = -1;
@@ -15,12 +17,16 @@
String recipientsCC = form.getFieldValue("recipientsCC","");
String subject = form.getFieldValue("subject","");
String alertText = form.getFieldValue("alertText","");
+ displayTextAfterPostValue =
form.getFieldValue("displayTextAfterPost",
+ getResourceBundle("form.displayTextAfterPostValue",
+ "Thank you. Your form has been sent.",jData));
logger.debug("new form -----------------------------");
logger.debug("sender: " + sender);
logger.debug("recipients: " + recipients);
logger.debug("recipientsCC: " + recipientsCC);
logger.debug("subject: " + subject);
+ logger.debug("displayTextAfterPostValue: " +
displayTextAfterPostValue);
StringBuffer mailBody = new StringBuffer();
// get all values posted
@@ -29,24 +35,27 @@
Enumeration fieldsEnum = fields.getContainers();
while (fieldsEnum.hasMoreElements()) {
JahiaContainer currentField = (JahiaContainer)
fieldsEnum.nextElement();
- String fieldTitle =
currentField.getFieldValue("fieldTitle","");
- String isMandatoryStr =
currentField.getFieldValue("isMandatory","false");
- boolean isMandatory = "true".equals(isMandatoryStr);
- String[] postedValues =
request.getParameterValues("field_" + currentField.getID());
- StringBuffer postedValuesSB = new StringBuffer("");
- if (postedValues != null) {
- for (int i = 0; i < postedValues.length; i++){
- if (i > 0){
- postedValuesSB.append(" - ");
+ String type = currentField.getFieldValue("type","");
+ if (!
ResourceBundleMarker.drawMarker(resBundleID,"submitButton","").equals(type)) {
+ String fieldTitle =
currentField.getFieldValue("fieldTitle","");
+ String isMandatoryStr =
currentField.getFieldValue("isMandatory","false");
+ boolean isMandatory = "true".equals(isMandatoryStr);
+ String[] postedValues =
request.getParameterValues("field_" + currentField.getID());
+ StringBuffer postedValuesSB = new StringBuffer("");
+ if (postedValues != null) {
+ for (int i = 0; i < postedValues.length; i++){
+ if (i > 0){
+ postedValuesSB.append(" - ");
+ }
+ postedValuesSB.append(postedValues[i]);
}
- postedValuesSB.append(postedValues[i]);
}
- }
- logger.debug("-- " + fieldTitle + ": " +
postedValuesSB.toString());
- mailBody.append(fieldTitle + " : " +
postedValuesSB.toString() + "\n");
- if (isMandatory && "".equals(postedValuesSB.toString()))
{
- logger.debug("Field [" + fieldTitle + "] is
mandatory");
- emptyMandatoryFields.add(new
Integer(currentField.getID()));
+ logger.debug("-- " + fieldTitle + ": " +
postedValuesSB.toString());
+ mailBody.append(fieldTitle + " : " +
postedValuesSB.toString() + "\n");
+ if (isMandatory &&
"".equals(postedValuesSB.toString())) {
+ logger.debug("Field [" + fieldTitle + "] is
mandatory");
+ emptyMandatoryFields.add(new
Integer(currentField.getID()));
+ }
}
}
}
@@ -62,6 +71,7 @@
try {
mailService.sendMessage (sender, recipients,
recipientsCC, null, subject, body);
+ forHasBeenPosted = true;
} catch (Throwable th) {
%>Error while sending mail : <%=th.getMessage()%><%
