Changeset 337:0177241710c6

Show
Ignore:
Timestamp:
09/10/09 15:38:41 (4 years ago)
Author:
tgambet
Branch:
default
convert_revision:
svn:cdcfb263-7567-472c-a848-e2c2df3466e7/trunk@338
Message:

option input values are kept if an error is thrown, only for dropdown and checkboxlist

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • WebContent/WEB-INF/resources/templates/includes/macros_index.vm

    r326 r337  
    7272#macro(createCheckboxList $param) 
    7373#set($defaults = $param.getMapOfDefaultValue()) 
     74#set( $D = '$' ) 
     75#set ($a = "${D}!{param_${param.Name}}") 
     76#set ($paramMap = "#evaluate ($a)") 
    7477<label><span>$param.getLongName($lang):</span></label>  
    7578<span class="checkboxlist"> 
    7679#foreach ($value in $param.getMapOfValue()) 
    77         <label>$value.getLongName($lang) 
    78                 <input type="checkbox" name="$param.getName()" value="$value.getName()"#if($defaults.containsKey($value.getName())) checked="checked" #end class="option_input" /> 
     80#set ($s = '') 
     81#if (($paramMap != "" && $paramMap.contains($value.Name)) || ($paramMap == "" && $defaults.containsKey($value.getName()))) #set ($s = 'checked="checked"') #end 
     82        <label> 
     83                <input type="checkbox" name="$param.getName()" value="$value.getName()" $s class="option_input" /> 
     84                $value.getLongName($lang) 
    7985        </label> 
    8086#end 
     
    8490#macro(createDropdown $param $multiple) 
    8591#set($defaults = $param.getMapOfDefaultValue()) 
     92#set( $D = '$' ) 
     93#set ($a = "${D}!{param_${param.Name}}") 
     94#set ($paramValue = "#evaluate ($a)") 
    8695<label><span>$param.getLongName($lang):</span>  
    8796        <select name="$param.Name" #if($multiple) multiple="multiple" size="3" #end class="option_input"> 
    8897#foreach ($value in $param.getMapOfValue()) 
    89                 <option value="$value.Name"#if($defaults.containsKey($value.getName())) selected="selected" #end>$value.getLongName($lang)</option> 
     98#set ($s = '') 
     99#if (($paramValue != "" && $paramValue.contains($value.Name)) || ($paramValue == "" && $defaults.containsKey($value.getName()))) #set ($s = 'selected="selected"') #end 
     100                <option value="$value.Name" $s>$value.getLongName($lang)</option> 
    90101#end 
    91102        </select>