Author: deepak
Date: Tue Feb 27 08:23:43 2018
New Revision: 1825430
URL: http://svn.apache.org/viewvc?rev=1825430&view=rev
Log:
Fixed: Lookup rendering broken due changes done at r#1825350, conditionGroup is
optional paramerter for lookup or related macros, so set empty default
parameter value for conditionGroup parameter
(OFBIZ-10195)
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/HtmlTemplate.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/HtmlTemplate.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/HtmlTemplate.ftl?rev=1825430&r1=1825429&r2=1825430&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/HtmlTemplate.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/includes/HtmlTemplate.ftl
Tue Feb 27 08:23:43 2018
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#macro lookupField className="" alert="" name="" value="" size="20"
maxlength="20" id="" event="" action="" readonly="" autocomplete=""
descriptionFieldName="" formName="" fieldFormName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer"
width=modelTheme.getLookupWidth() height=modelTheme.getLookupHeight()
position="topleft" fadeBackground="true" clearText="" showDescription=""
initiallyCollapsed="" tabindex="">
+<#macro lookupField conditionGroup="" className="" alert="" name="" value=""
size="20" maxlength="20" id="" event="" action="" readonly="" autocomplete=""
descriptionFieldName="" formName="" fieldFormName="" targetParameterIter=""
imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="layer"
width=modelTheme.getLookupWidth() height=modelTheme.getLookupHeight()
position="topleft" fadeBackground="true" clearText="" showDescription=""
initiallyCollapsed="" tabindex="">
<#if (!ajaxEnabled?has_content)>
<#assign javascriptEnabled =
Static["org.apache.ofbiz.base.util.UtilHttp"].isJavaScriptEnabled(request) />
<#if (javascriptEnabled)>
@@ -32,7 +32,7 @@ under the License.
<#else>
<#local readonly = false />
</#if>
- <@renderLookupField name formName fieldFormName className alert value size
maxlength id event action readonly autocomplete descriptionFieldName
targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height
position fadeBackground clearText showDescription initiallyCollapsed tabindex/>
+ <@renderLookupField name formName fieldFormName conditionGroup className
alert value size maxlength id event action readonly autocomplete
descriptionFieldName targetParameterIter imgSrc ajaxUrl ajaxEnabled
presentation width height position fadeBackground clearText showDescription
initiallyCollapsed tabindex/>
</#macro>
<#macro nextPrev commonUrl="" ajaxEnabled=false javaScriptEnabled=false
paginateStyle="nav-pager" paginateFirstStyle="nav-first" viewIndex=0
highIndex=0 listSize=0 viewSize=1 ajaxFirstUrl="" firstUrl=""
paginateFirstLabel="" paginatePreviousStyle="nav-previous" ajaxPreviousUrl=""
previousUrl="" paginatePreviousLabel="" pageLabel="" ajaxSelectUrl=""
selectUrl="" ajaxSelectSizeUrl="" selectSizeUrl="" commonDisplaying=""
paginateNextStyle="nav-next" ajaxNextUrl="" nextUrl="" paginateNextLabel=""
paginateLastStyle="nav-last" ajaxLastUrl="" lastUrl="" paginateLastLabel=""
paginateViewSizeLabel="" >
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl?rev=1825430&r1=1825429&r2=1825430&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl
Tue Feb 27 08:23:43 2018
@@ -207,7 +207,7 @@ under the License.
</span>
</#macro>
-<#macro renderDropDownField name className alert id formName otherFieldName
action explicitDescription options fieldName otherFieldName otherValue
otherFieldSize ajaxEnabled ajaxOptions frequency minChars choices autoSelect
partialSearch partialChars ignoreCase fullSearch conditionGroup tabindex=""
multiple="" event="" size="" firstInList="" currentValue="" allowEmpty=""
dDFCurrent="" noCurrentSelectedKey="">
+<#macro renderDropDownField name className alert id formName otherFieldName
action explicitDescription options fieldName otherFieldName otherValue
otherFieldSize ajaxEnabled ajaxOptions frequency minChars choices autoSelect
partialSearch partialChars ignoreCase fullSearch conditionGroup="" tabindex=""
multiple="" event="" size="" firstInList="" currentValue="" allowEmpty=""
dDFCurrent="" noCurrentSelectedKey="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -252,7 +252,7 @@ under the License.
</#if>
</#macro>
-<#macro renderCheckField items className alert id name action conditionGroup
allChecked="" currentValue="" event="" tabindex="">
+<#macro renderCheckField items className alert id name action
conditionGroup="" allChecked="" currentValue="" event="" tabindex="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -267,7 +267,7 @@ under the License.
</#list>
</#macro>
-<#macro renderRadioField items className alert name action conditionGroup
currentValue="" noCurrentSelectedKey="" event="" tabindex="">
+<#macro renderRadioField items className alert name action conditionGroup=""
currentValue="" noCurrentSelectedKey="" event="" tabindex="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -302,7 +302,7 @@ under the License.
<input type="reset" <@renderClass className alert /> name="${name}"<#if
title?has_content> value="${title}"</#if>/>
</#macro>
-<#macro renderHiddenField name conditionGroup value="" id="" event=""
action="">
+<#macro renderHiddenField name conditionGroup="" value="" id="" event=""
action="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -461,7 +461,7 @@ under the License.
<#macro renderFormatEmptySpace> </#macro>
-<#macro renderTextFindField name defaultOption opBeginsWith opContains
opIsEmpty opNotEqual className alert hideIgnoreCase ignCase ignoreCase
conditionGroup value="" opEquals="" size="" maxlength="" autocomplete=""
titleStyle="" tabindex="">
+<#macro renderTextFindField name defaultOption opBeginsWith opContains
opIsEmpty opNotEqual className alert hideIgnoreCase ignCase ignoreCase
conditionGroup="" value="" opEquals="" size="" maxlength="" autocomplete=""
titleStyle="" tabindex="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -487,7 +487,7 @@ under the License.
</#if>
</#macro>
-<#macro renderDateFindField className alert name dateType formName value
defaultDateTimeString imgSrc localizedIconTitle defaultOptionFrom
defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan
opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty conditionGroup
localizedInputTitle="" value2="" size="" maxlength="" titleStyle="" tabindex="">
+<#macro renderDateFindField className alert name dateType formName value
defaultDateTimeString imgSrc localizedIconTitle defaultOptionFrom
defaultOptionThru opEquals opSameDay opGreaterThanFromDayStart opGreaterThan
opGreaterThan opLessThan opUpToDay opUpThruDay opIsEmpty conditionGroup=""
localizedInputTitle="" value2="" size="" maxlength="" titleStyle="" tabindex="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -568,7 +568,7 @@ under the License.
</span>
</#macro>
-<#macro renderRangeFindField className alert value defaultOptionFrom opEquals
opGreaterThan opGreaterThanEquals opLessThan opLessThanEquals defaultOptionThru
conditionGroup name="" size="" maxlength="" autocomplete="" titleStyle=""
value2="" tabindex="">
+<#macro renderRangeFindField className alert value defaultOptionFrom opEquals
opGreaterThan opGreaterThanEquals opLessThan opLessThanEquals defaultOptionThru
conditionGroup="" name="" size="" maxlength="" autocomplete="" titleStyle=""
value2="" tabindex="">
<#if conditionGroup?has_content>
<input type="hidden" name="${name}_grp" value="${conditionGroup}"/>
</#if>
@@ -633,7 +633,7 @@ Parameter: lastViewName, String, optiona
Parameter: tabindex, String, optional - HTML tabindex number.
Parameter: delegatorName, String, optional - name of the delegator in context.
-->
-<#macro renderLookupField name formName fieldFormName conditionGroup
className="" alert="false" value="" size="" maxlength="" id="" event=""
action="" readonly=false autocomplete="" descriptionFieldName=""
targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled
presentation="layer" width=modelTheme.getLookupWidth()
height=modelTheme.getLookupHeight() position=modelTheme.getLookupPosition()
fadeBackground="true" clearText="" showDescription="" initiallyCollapsed=""
lastViewName="main" tabindex="" delegatorName="default">
+<#macro renderLookupField name formName fieldFormName conditionGroup=""
className="" alert="false" value="" size="" maxlength="" id="" event=""
action="" readonly=false autocomplete="" descriptionFieldName=""
targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled
presentation="layer" width=modelTheme.getLookupWidth()
height=modelTheme.getLookupHeight() position=modelTheme.getLookupPosition()
fadeBackground="true" clearText="" showDescription="" initiallyCollapsed=""
lastViewName="main" tabindex="" delegatorName="default">
<#if
Static["org.apache.ofbiz.widget.model.ModelWidget"].widgetBoundaryCommentsEnabled(context)><#--
context is always null here, but this is handled in
widgetBoundaryCommentsEnabled -->
<!-- @renderLookupField -->
</#if>
