Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- BZ-1006735: fixing inputs with null value in dynamic forms
  • Loading branch information
salaboy committed Sep 19, 2013
1 parent b4f86a8 commit 4d0af3f
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 59 deletions.
@@ -1,7 +1,7 @@
package org.jbpm.kie.services.impl.form.provider;


import freemarker.template.DefaultObjectWrapper;
import freemarker.ext.beans.BeansWrapper;
import freemarker.template.Template;
import org.jbpm.kie.services.impl.form.FormProvider;

Expand All @@ -17,7 +17,9 @@ protected String render(String name, InputStream src, Map<String, Object> render
String str = null;
try {
freemarker.template.Configuration cfg = new freemarker.template.Configuration();
cfg.setObjectWrapper(new DefaultObjectWrapper());
BeansWrapper defaultInstance = new BeansWrapper();
defaultInstance.setSimpleMapWrapper(true);
cfg.setObjectWrapper(defaultInstance);
cfg.setTemplateUpdateDelay(0);
Template temp = new Template(name, new InputStreamReader(src), cfg);
StringWriter out = new StringWriter();
Expand Down
@@ -1,25 +1,14 @@
<div class="form-content one-col">

<input type="hidden" name="processId" value="${process.id}"/>


<#if outputs?size != 0>
<h2>Outputs</h2><br/>
</#if>

<#list outputs?keys as key>
<#assign value = outputs[key]>

<div class="form-row clearfix">
<label>${key}</label>

<input type="text" name="${key}" value=""/>

</div>
<#if outputs?has_content>
<h2>Outputs</h2><br/>
<#list outputs?keys as key>
<div class="form-row clearfix">
<label>${key}</label>
<input type="text" name="${key}" value=""/>
</div>

</#list>



<i>* Automatically generated form, only supports simple text strings *</i>
</div>
</#list>
</#if>
<i>* Automatically generated form, only supports simple text strings *</i>
</div>
@@ -1,44 +1,37 @@

<div class="form-content">

<input type="hidden" name="taskId" value="${task.id}"/>

<#if inputs?size != 0>
<h2>Inputs</h2><br/>
</#if>
<#list inputs?keys as key>
<#assign value = inputs[key]>
<div class="form-row clearfix">
<label>${key}</label>
<div class="input-button">
<input type="text" name="${key}" value="${value}"/>
</div>
</div>

</#list>
<#if outputs?size != 0>
<h2>Outputs</h2><br/>
</#if>

<#list outputs?keys as key>
<#assign value = outputs[key]>
<#if task.taskData.status = 'Reserved'>

<#if inputs?has_content>
<h2>Inputs</h2><br/>
<#list inputs?keys as key>
<div class="form-row clearfix">
<label>${key}</label>
<div class="input-button">
<input type="text" name="${key}" value="${inputs[key]!""}"/>
</div>
</div>

</#if>
<#if task.taskData.status = 'InProgress'>
<div class="form-row clearfix">
<label>${key}</label>
<div class="input-button">
<input type="text" name="${key}" value="${value}"/>
</#list>
</#if>

<#if outputs?has_content>
<h2>Outputs</h2><br/>
<#list outputs?keys as key>
<#if task.taskData.status = 'Reserved'>
<div class="form-row clearfix">
<label>${key}</label>
<div class="input-button">
</div>
</div>
</div>
</#if>
</#list>
<i>* Automatically generated form, only supports simple text strings *</i>
</div>
</#if>
<#if task.taskData.status = 'InProgress'>
<div class="form-row clearfix">
<label>${key}</label>
<div class="input-button">
<input type="text" name="${key}" value="${outputs[key]!""}"/>
</div>
</div>
</#if>
</#list>
</#if>
<i>* Automatically generated form, only supports simple text strings *</i>
</div>

0 comments on commit 4d0af3f

Please sign in to comment.