svn commit: r1618336 [3/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
Locked
svn commit: r1618336 [3/21] - in /ofbiz/trunk/applications: accounting/webapp/accounting/a
 
|
Modified: ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl (original) +++ ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl Sat Aug 16 11:34:57 2014 @@ -18,7 +18,7 @@ under the License. --> <#macro renderSurveyQuestionText surveyQuestionAndAppl> - <div>${surveyQuestionAndAppl.question?if_exists}</div> + <div>${surveyQuestionAndAppl.question!}</div> <#if surveyQuestionAndAppl.hint?has_content> <div>${surveyQuestionAndAppl.hint}</div> </#if> @@ -43,37 +43,37 @@ under the License. <option <#if "N" == selectedOption>selected="selected"</#if>>N</option> </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXTAREA"/> - <textarea cols="40" rows="5" name="${questionFieldName}">${(answer.textResponse)?if_exists}</textarea> + <textarea cols="40" rows="5" name="${questionFieldName}">${(answer.textResponse)!}</textarea> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_SHORT"/> - <input type="text" size="15" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="15" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "TEXT_LONG"/> - <input type="text" size="35" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="35" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "EMAIL"/> - <input type="text" size="30" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="30" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "URL"/> - <input type="text" size="40" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="40" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "DATE"/> - <input type="text" size="12" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="12" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CREDIT_CARD"/> - <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GIFT_CARD"/> - <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="text" size="20" class="inputBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_CURRENCY"/> - <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.currencyResponse)?default(defValue?if_exists)}" /> + <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.currencyResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_FLOAT"/> - <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.floatResponse)?default(defValue?if_exists)}" /> + <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.floatResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "NUMBER_LONG"/> - <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.numericResponse?default(defValue)?string("#"))?if_exists}" /> + <input type="text" size="6" class="inputBox" name="${questionFieldName}" value="${(answer.numericResponse?default(defValue)?string("#"))!}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "PASSWORD"/> - <input type="password" size="30" class="textBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" /> + <input type="password" size="30" class="textBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue!)}" /> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"/> <#if (answer.contentId)?has_content> <#assign content = answer.getRelatedOne("Content", false)> - <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists} + <a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName!} </#if> <input type="file" size="15" name="${questionFieldName}" class="inputBox"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"/> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists/> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)!/> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")/> <select name="${questionFieldName}"> <#if surveyQuestionAndAppl.requiredField?default("N") != "Y"> @@ -81,7 +81,7 @@ under the License. </#if> <#if options?has_content> <#list options as option> - <option value="${option.surveyOptionSeqId}" <#if option.surveyOptionSeqId == selectedOption>selected="selected"</#if>>${option.description?if_exists}</option> + <option value="${option.surveyOptionSeqId}" <#if option.surveyOptionSeqId == selectedOption>selected="selected"</#if>>${option.description!}</option> </#list> <#else> <option value="">Nothing to choose</option> @@ -89,7 +89,7 @@ under the License. </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "ENUMERATION"/> <select name="${questionFieldName}"> - <#assign formatString = surveyQuestionAndAppl.get("formatString")?if_exists/> + <#assign formatString = surveyQuestionAndAppl.get("formatString")!/> <#assign enums = surveyQuestionAndAppl.getRelated("Enumeration", null, null, false)/> <#list enums as enum> <#if (((answer.textResponse)?has_content && answer.textResponse == enum.enumId) || (defValue == enum.enumId))> @@ -107,8 +107,8 @@ under the License. </select> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "GEO"/> <select name="${questionFieldName}"> - <#assign formatString = surveyQuestionAndAppl.get("formatString")?if_exists/> - <#assign parentGeoId = surveyQuestionAndAppl.get("geoId")?if_exists/> + <#assign formatString = surveyQuestionAndAppl.get("formatString")!/> + <#assign parentGeoId = surveyQuestionAndAppl.get("geoId")!/> <#assign geos = Static["org.ofbiz.common.geo.GeoWorker"].expandGeoGroup(parentGeoId, delegator)> <#list geos as geo> <#if (((answer.textResponse)?has_content && answer.textResponse == geo.geoId) || (defValue == geo.geoId))> @@ -159,7 +159,7 @@ under the License. <#-- survey ID --> <input type="hidden" name="surveyId" value="${survey.surveyId}"/> -<h1>${survey.description?if_exists}</h1> +<h1>${survey.description!}</h1> <br /> <#if survey.comments?has_content> @@ -176,7 +176,7 @@ under the License. <#-- Get and setup MultiResp info for this question --> <#assign openMultiRespHeader = false/> <#assign closeMultiRespHeader = false/> - <#assign surveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)?if_exists/> + <#assign surveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)!/> <#if surveyMultiResp?has_content> <#assign surveyMultiRespColumnList = surveyMultiResp.getRelated("SurveyMultiRespColumn", null, Static["org.ofbiz.base.util.UtilMisc"].toList("sequenceNum"), true)/> @@ -220,7 +220,7 @@ under the License. </#if> <#if surveyMultiResp?has_content> - <#assign sqaaWithColIdList = (sqaaWithColIdListByMultiRespId[surveyMultiResp.surveyMultiRespId])?if_exists/> + <#assign sqaaWithColIdList = (sqaaWithColIdListByMultiRespId[surveyMultiResp.surveyMultiRespId])!/> <tr> <td> <@renderSurveyQuestionText surveyQuestionAndAppl=surveyQuestionAndAppl/> @@ -251,7 +251,7 @@ under the License. <#else/> <#-- special formatting for select boxes --> <#assign align = "left"/> - <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> + <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#if (surveyQuestionAndAppl.surveyQuestionTypeId == "BOOLEAN" || surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT" || surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION")> <#assign align = "right"/> </#if> @@ -259,19 +259,19 @@ under the License. <#-- get an answer from the answerMap --> <#if surveyAnswers?has_content> - <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists/> + <#assign answer = surveyAnswers.get(surveyQuestionAndAppl.surveyQuestionId)!/> </#if> <#-- get the default value from value map --> <#if defaultValues?has_content> - <#assign defValue = defaultValues.get(surveyQuestionAndAppl.surveyQuestionId)?if_exists/> + <#assign defValue = defaultValues.get(surveyQuestionAndAppl.surveyQuestionId)!/> </#if> <tr> - <#if surveyQuestionAndAppl?exists && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> + <#if surveyQuestionAndAppl?? && surveyQuestionAndAppl.surveyQuestionTypeId?has_content> <#-- seperator options --> <#if surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5"><div>${surveyQuestionAndAppl.question?if_exists}</div></td> + <td colspan="5"><div>${surveyQuestionAndAppl.question!}</div></td> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "SEPERATOR_LINE"/> <td colspan="5"><hr /></td> <#else/> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSContentEdit.ftl Sat Aug 16 11:34:57 2014 @@ -32,7 +32,7 @@ ${menuWrapper.renderMenuString()} <table width='100%' cellpadding='0' cellspacing='0' border='0'> <tr> <td> - <h1>${contentId?if_exists} + <h1>${contentId!} </h1> </td> <td align="right"> @@ -43,7 +43,7 @@ ${menuWrapper.renderMenuString()} <#if currentValue?has_content> - <@renderTextData content=currentValue textData=textData?if_exists /> + <@renderTextData content=currentValue textData=textData! /> </#if> <#-- <#if textList?has_content> @@ -178,7 +178,7 @@ ${menuWrapper.renderMenuString()} <div class="boxhead"> Image Information</div> </td> <td valign="middle" align="right"> - <a href="<@ofbizUrl>EditAddImage?contentId=${imgContentId?if_exists}dataResourceId=${imgDataResourceId?if_exists}</@ofbizUrl>" class="submenutextright">Update</a> + <a href="<@ofbizUrl>EditAddImage?contentId=${imgContentId!}dataResourceId=${imgDataResourceId!}</@ofbizUrl>" class="submenutextright">Update</a> </td> </tr> </table> @@ -191,7 +191,7 @@ ${menuWrapper.renderMenuString()} <td> <table width="100%" border="0" cellpadding="0" cellspacing='0'> <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Image</b></div></td><td> </td><td><div class='tabletext'> - <img src="<@ofbizUrl>img?imgId=${imgDataResourceId?if_exists}</@ofbizUrl>" alt="" /> + <img src="<@ofbizUrl>img?imgId=${imgDataResourceId!}</@ofbizUrl>" alt="" /> <div></td></tr> </table> </td> @@ -215,7 +215,7 @@ ${menuWrapper.renderMenuString()} <@renderTextData contentId=contentId textData=currentTextData /> </#if> </#if> - <#assign contentAssocViewList =Static["org.ofbiz.content.content.ContentWorker"].getContentAssocViewList(delegator, contentId, null, "SUB_CONTENT", null, null)?if_exists /> + <#assign contentAssocViewList =Static["org.ofbiz.content.content.ContentWorker"].getContentAssocViewList(delegator, contentId, null, "SUB_CONTENT", null, null)! /> <#list contentAssocViewList as contentAssocDataResourceView> <#assign contentId2 = contentAssocDataResourceView.contentId/> <#assign mapKey = contentAssocDataResourceView.mapKey/> @@ -229,7 +229,7 @@ ${menuWrapper.renderMenuString()} --> <#macro renderTextData content textData > - <#assign contentId=content.contentId?if_exists/> + <#assign contentId=content.contentId!/> <table border="0" width='100%' cellspacing='0' cellpadding='0' class='boxoutside'> <tr> <td width='100%'> @@ -239,7 +239,7 @@ ${menuWrapper.renderMenuString()} <div class="boxhead"> </div> </td> <td valign="middle" align="right"> - <a href="<@ofbizUrl>EditAddContent?contentId=${content.contentId?if_exists}&contentIdTo=${content.caContentIdTo?if_exists}&contentAssocTypeId=${content.caContentAssocTypeId?if_exists}&fromDate=${content.caFromDate?if_exists}&mapKey=${content.caMapKey?if_exists}</@ofbizUrl>" class="submenutextright">Update</a> + <a href="<@ofbizUrl>EditAddContent?contentId=${content.contentId!}&contentIdTo=${content.caContentIdTo!}&contentAssocTypeId=${content.caContentAssocTypeId!}&fromDate=${content.caFromDate!}&mapKey=${content.caMapKey!}</@ofbizUrl>" class="submenutextright">Update</a> </td> </tr> </table> @@ -251,8 +251,8 @@ ${menuWrapper.renderMenuString()} <tr> <td> <table width="100%" border="0" cellpadding="0" cellspacing='0'> - <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Content Name</b></div></td><td> </td><td><div class='tabletext'>${content.contentName?if_exists}</div></td></tr> - <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Description</b></div></td><td> </td><td><div class='tabletext'>${content.description?if_exists}<div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Content Name</b></div></td><td> </td><td><div class='tabletext'>${content.contentName!}</div></td></tr> + <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b>Description</b></div></td><td> </td><td><div class='tabletext'>${content.description!}<div></td></tr> </table> </td> </tr> @@ -266,7 +266,7 @@ ${menuWrapper.renderMenuString()} <td> <table width="100%" border="0" cellpadding="0" cellspacing='0'> <tr><td align="right" nowrap="nowrap"><div class='tabletext'><b></b></div></td><td> </td><td><div class='tabletext'> -<#-- ${textData?if_exists} --> +<#-- ${textData!} --> <@renderContentAsText subContentId=content.contentId editRequestName="/EditAddContent"/> <div></td></tr> </table> @@ -280,15 +280,15 @@ ${menuWrapper.renderMenuString()} <#macro publishContent forumId contentId formAction="/updatePublishLinksMulti" indentIndex=0 catTrail=[]> -<#local thisContentId=catTrail[indentIndex]?if_exists/> +<#local thisContentId=catTrail[indentIndex]!/> <#assign viewIdx = "" /> <#if requestParameters.viewIndex?has_content> -<#assign viewIdx = requestParameters.viewIndex?if_exists?number /> +<#assign viewIdx = requestParameters.viewIndex!?number /> </#if> <#assign viewSz = "" /> <#if requestParameters.viewSize?has_content> -<#assign viewSz = requestParameters.viewSize?if_exists?number /> +<#assign viewSz = requestParameters.viewSize!?number /> </#if> <#local indent = ""> @@ -314,7 +314,7 @@ ${menuWrapper.renderMenuString()} <@loopSubContent contentId=forumId viewIndex=viewIdx viewSize=viewSz contentAssocTypeId="SUBSITE" returnAfterPickWhen="1==1";> <#local isPublished = "" /> - <#assign contentAssocViewFrom=Static["org.ofbiz.content.content.ContentWorker"].getContentAssocViewFrom(delegator, subContentId, contentId, "PUBLISH_LINK", null, null)?if_exists /> + <#assign contentAssocViewFrom=Static["org.ofbiz.content.content.ContentWorker"].getContentAssocViewFrom(delegator, subContentId, contentId, "PUBLISH_LINK", null, null)! /> <#if contentAssocViewFrom?has_content> <#local isPublished = "checked='checked'" /> </#if> @@ -322,7 +322,7 @@ ${menuWrapper.renderMenuString()} <td > ${indent} <#local plusMinus="-"/> - ${plusMinus} ${content.contentName?if_exists} + ${plusMinus} ${content.contentName!} </td > <td > <input type="checkbox" name="publish_o_${rowCount}" value="Y" ${isPublished}/> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSSites.ftl Sat Aug 16 11:34:57 2014 @@ -29,10 +29,10 @@ function call_fieldlookup4(rootForumId, <#include "publishlib.ftl" /> --> <#if !rootForumId?has_content> - <#assign rootForumId=requestParameters.rootForumId?if_exists/> + <#assign rootForumId=requestParameters.rootForumId!/> </#if> <#if !rootForumId?has_content> - <#assign rootForumId=defaultSiteId?if_exists/> + <#assign rootForumId=defaultSiteId!/> </#if> <@checkPermission entityOperation="_ADMIN" targetOperation="CONTENT_ADMIN" > <br /> @@ -47,7 +47,7 @@ function call_fieldlookup4(rootForumId, </td> <td valign="middle"> <div class="boxhead"> - <input type="text" name="rootForumId" size="20" value="${rootForumId?if_exists}"/> + <input type="text" name="rootForumId" size="20" value="${rootForumId!}"/> </div> </td> <td valign="middle" align="right"> @@ -109,7 +109,7 @@ function call_fieldlookup4(rootForumId, <#macro showSites forumId formAction="/enableSites" indentIndex=0 catTrail=[]> -<#local thisContentId=catTrail[indentIndex]?if_exists/> +<#local thisContentId=catTrail[indentIndex]!/> <#local indent = ""> <#if 0 < indentIndex > @@ -124,7 +124,7 @@ function call_fieldlookup4(rootForumId, <td > ${indent} <#local plusMinus="-"/> - ${plusMinus} ${content.contentName?if_exists} + ${plusMinus} ${content.contentName!} </td > <td > <a class="buttontext" href="<@ofbizUrl>CMSSites?rootForumId=${rootForumId}&moderatedSiteId=${content.contentId}</@ofbizUrl>">Moderate</a> @@ -160,7 +160,7 @@ function call_fieldlookup4(rootForumId, <td> <b>name:</b>${content.contentName} </td> <@injectNodeTrailCsv subContentId=content.contentId redo="true" contentAssocTypeId="PUBLISH_LINK"> <td> - <a class="tabButton" href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv?if_exists}</@ofbizUrl>" >View</a> + <a class="tabButton" href="<@ofbizUrl>CMSContentEdit?contentId=${content.contentId}&nodeTrailCsv=${nodeTrailCsv!}</@ofbizUrl>" >View</a> </td> <td> <b>submitted:</b> @@ -227,9 +227,9 @@ function call_fieldlookup4(rootForumId, <#list blogRoleIdList as roleTypeId> <#assign cappedSiteRole= Static["org.ofbiz.entity.model.ModelUtil"].dbNameToVarName(roleTypeId) /> <td align="center"> - <input type="checkbox" name="${cappedSiteRole}_o_${rowCount}" value="Y" <#if siteRoleMap[cappedSiteRole]?if_exists == "Y">checked="checked"</#if>/> + <input type="checkbox" name="${cappedSiteRole}_o_${rowCount}" value="Y" <#if siteRoleMap[cappedSiteRole]! == "Y">checked="checked"</#if>/> </td> - <input type="hidden" name="${cappedSiteRole}FromDate_o_${rowCount}" value="${siteRoleMap[cappedSiteRole + "FromDate"]?if_exists}"/> + <input type="hidden" name="${cappedSiteRole}FromDate_o_${rowCount}" value="${siteRoleMap[cappedSiteRole + "FromDate"]!}"/> </#list> </tr> <input type="hidden" name="contentId_o_${rowCount}" value="${forumId}"/> Modified: ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/content/ContentNav.ftl Sat Aug 16 11:34:57 2014 @@ -108,7 +108,7 @@ var rawdata = [ <#-------------------------------------------------------------------------------------callDocument function--> function callDocument(contentId) { - var tabitem='${tabButtonItem?if_exists}'; + var tabitem='${tabButtonItem!}'; if (tabitem=="navigateContent") listDocument = '<@ofbizUrl>/views/ListDocument</@ofbizUrl>'; if (tabitem=="LookupContentTree") Modified: ofbiz/trunk/applications/content/webapp/content/content/ContentSearchOptions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/ContentSearchOptions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/content/ContentSearchOptions.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/content/ContentSearchOptions.ftl Sat Aug 16 11:34:57 2014 @@ -28,7 +28,7 @@ under the License. <td align="right" valign="middle" class="label">${uiLabelMap.ContentKeywords}</td> <td valign="middle"> <div> - <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING?if_exists}"/> + <input type="text" name="SEARCH_STRING" size="40" value="${requestParameters.SEARCH_STRING!}"/> ${uiLabelMap.CommonAny}<input type="radio" name="SEARCH_OPERATOR" value="OR" <#if searchOperator == "OR">checked="checked"</#if>/> ${uiLabelMap.CommonAll}<input type="radio" name="SEARCH_OPERATOR" value="AND" <#if searchOperator == "AND">checked="checked"</#if>/> </div> @@ -38,7 +38,7 @@ under the License. <td align="right" valign="middle" class="label">${uiLabelMap.FormFieldTitle_contentId}</td> <td valign="middle"> <div> - <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CONTENT_ID?if_exists}" formName="advToKeyWordSearchForm" name="SEARCH_CONTENT_ID" id="SEARCH_CONTENT_ID" fieldFormName="LookupContent"/> + <@htmlTemplate.lookupField value="${requestParameters.SEARCH_CONTENT_ID!}" formName="advToKeyWordSearchForm" name="SEARCH_CONTENT_ID" id="SEARCH_CONTENT_ID" fieldFormName="LookupContent"/> </div> </td> </tr> @@ -62,7 +62,7 @@ under the License. <td align="right" valign="middle" class="label">${uiLabelMap.PartyPartyId}</td> <td valign="middle"> <div> - <@htmlTemplate.lookupField value="${requestParameters.partyId?if_exists}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> + <@htmlTemplate.lookupField value="${requestParameters.partyId!}" formName="advToKeyWordSearchForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> </div> </td> </tr> @@ -85,13 +85,13 @@ under the License. <table class="basic-table" cellspacing="0"> <tr> <td nowrap="nowrap"> - <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate?if_exists}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="fromDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.fromDate!}" size="25" maxlength="30" id="fromDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span>${uiLabelMap.CommonFrom}</span> </td> </tr> <tr> <td nowrap="nowrap"> - <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate?if_exists}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> + <@htmlTemplate.renderDateTimeField name="thruDate" event="" action="" className="" alert="" title="Format: yyyy-MM-dd HH:mm:ss.SSS" value="${requestParameters.thruDate!}" size="25" maxlength="30" id="thruDate1" dateType="date" shortDateInput=false timeDropdownParamName="" defaultDateTimeString="" localizedIconTitle="" timeDropdown="" timeHourName="" classString="" hour1="" hour2="" timeMinutesName="" minutes="" isTwelveHour="" ampmName="" amSelected="" pmSelected="" compositeType="" formName=""/> <span>${uiLabelMap.CommonThru}</span> </td> </tr> Modified: ofbiz/trunk/applications/content/webapp/content/content/ContentSearchResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/ContentSearchResults.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/content/ContentSearchResults.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/content/ContentSearchResults.ftl Sat Aug 16 11:34:57 2014 @@ -58,7 +58,7 @@ under the License. <#assign content = delegator.findOne("Content", Static["org.ofbiz.base.util.UtilMisc"].toMap("contentId", contentId), false)> <tr> <td> - <a href="<@ofbizUrl>editContent?contentId=${contentId}</@ofbizUrl>" class="buttontext">${contentId} ${(content.contentName)?if_exists}</a> + <a href="<@ofbizUrl>editContent?contentId=${contentId}</@ofbizUrl>" class="buttontext">${contentId} ${(content.contentName)!}</a> </td> </tr> </#list> Modified: ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/content/DisplayContentNav.ftl Sat Aug 16 11:34:57 2014 @@ -78,7 +78,7 @@ var rawdata = [ <#-------------------------------------------------------------------------------------callDocument function--> function callDocument(contentId) { - var tabitem='${tabButtonItem?if_exists}'; + var tabitem='${tabButtonItem!}'; if (tabitem=="navigateContent") listDocument = '<@ofbizUrl>/views/ListDocument</@ofbizUrl>'; if (tabitem=="LookupContentTree") Modified: ofbiz/trunk/applications/content/webapp/content/content/nav.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/content/nav.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/content/nav.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/content/nav.ftl Sat Aug 16 11:34:57 2014 @@ -37,7 +37,7 @@ var rawdata = [ <#list assocList as assoc> { "data": {"title" : unescapeHtmlText("${assoc.categoryName!assoc.dataCategoryId!}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.dataCategoryId!}');"}} - <#assign assocs = assoc.getRelated("ChildDataCategory", null, null, false)?if_exists/> + <#assign assocs = assoc.getRelated("ChildDataCategory", null, null, false)!/> <#if assocChilds?has_content> ,"children": [ <@fillTree assocList = assocChilds/> Modified: ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/contentsetup/UserPermissions.ftl Sat Aug 16 11:34:57 2014 @@ -32,19 +32,19 @@ function call_fieldlookup3(view_name) { rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "partyId"); rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", "${partyId?if_exists}"); + rowCountElement.setAttribute("value", "${partyId!}"); document.forms.siteRoleForm.appendChild(rowCountElement); rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "userLoginId"); rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", "${userLoginId?if_exists}"); + rowCountElement.setAttribute("value", "${userLoginId!}"); document.forms.siteRoleForm.appendChild(rowCountElement); rowCountElement = document.createElement("input"); rowCountElement.setAttribute("name", "webSitePublishPoint"); rowCountElement.setAttribute("type", "hidden"); - rowCountElement.setAttribute("value", "${webSitePublishPoint?if_exists}"); + rowCountElement.setAttribute("value", "${webSitePublishPoint!}"); document.forms.siteRoleForm.appendChild(rowCountElement); document.forms.siteRoleForm.submit(); @@ -65,10 +65,10 @@ function call_fieldlookup3(view_name) { </td> <td valign="middle"> <div class="boxhead"> - <input type="text" name="webSitePublishPoint" size="20" value="${webSitePublishPoint?if_exists}" /> + <input type="text" name="webSitePublishPoint" size="20" value="${webSitePublishPoint!}" /> <input type="submit" value="${uiLabelMap.CommonRefresh}"/> - <input type="hidden" name="partyId" value="${partyId?if_exists}"/> - <input type="hidden" name="userLoginId" value="${userLoginId?if_exists}"/> + <input type="hidden" name="partyId" value="${partyId!}"/> + <input type="hidden" name="userLoginId" value="${userLoginId!}"/> </div> </td> </tr> @@ -90,7 +90,7 @@ function call_fieldlookup3(view_name) { <#assign rowCount=0/> <#list siteList as map> <tr> - <td class="">${map.partyId?if_exists}</td> + <td class="">${map.partyId!}</td> <#list blogRoleIdList as roleTypeId> <#assign cappedSiteRole= Static["org.ofbiz.entity.model.ModelUtil"].dbNameToVarName(roleTypeId) /> <td align="center"> @@ -104,7 +104,7 @@ function call_fieldlookup3(view_name) { </#list> <tr> <td> - <div class="smallSubmit" ><a href="javascript:submitRows('${rowCount?if_exists}')">${uiLabelMap.CommonUpdate}</a></div> + <div class="smallSubmit" ><a href="javascript:submitRows('${rowCount!}')">${uiLabelMap.CommonUpdate}</a></div> </td> </tr> </table> Modified: ofbiz/trunk/applications/content/webapp/content/layout/renderSubContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/renderSubContent.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/renderSubContent.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/renderSubContent.ftl Sat Aug 16 11:34:57 2014 @@ -18,9 +18,9 @@ under the License. --> <hr /> -<#if parameters.contentId?exists> +<#if parameters.contentId??> <#assign id=parameters.contentId/> - <@editRenderSubContent contentId="TEMPLATE_MASTER" mapKey="" editTemplate="true" subContentId=id?if_exists> + <@editRenderSubContent contentId="TEMPLATE_MASTER" mapKey="" editTemplate="true" subContentId=id!> <@renderSubContent throwExceptionOnError="false"/> </@editRenderSubContent> </#if> Modified: ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/lookup/ContentTreeLookupList.ftl Sat Aug 16 11:34:57 2014 @@ -69,29 +69,29 @@ <#if tabButtonItem=="ListContentTree"> <#--Form ListContentTree--> <tr <#if alt_row> class="alternate-row"</#if>> - <td><a class="plain" href="javascript:set_value('${contentData.contentId?if_exists}')">${contentData.contentId?if_exists}</a></td> - <td>${contentData.contentName?if_exists}</td> - <td>${contentData.mimeTypeId?if_exists}</td> + <td><a class="plain" href="javascript:set_value('${contentData.contentId!}')">${contentData.contentId!}</a></td> + <td>${contentData.contentName!}</td> + <td>${contentData.mimeTypeId!}</td> </tr> <#elseif tabButtonItem=="ListDocument"> <#--Form ListDocument--> <tr <#if alt_row> class="alternate-row"</#if>> - <td><a class="plain" href="/content/control/editContent?contentId=${contentData.contentId?if_exists}">${contentData.contentName?if_exists}[${contentData.contentId?if_exists}]</a></td> - <td><a class="plain" href="/content/control/showContent?contentId=${contentData.contentId?if_exists}" target="_blank">${uiLabelMap.CommonView}</a></td> - <td>${contentData.contentTypeId?if_exists}</td> - <td>${contentData.mimeTypeId?if_exists}</td> - <td>${contentData.statusId?if_exists}</td> + <td><a class="plain" href="/content/control/editContent?contentId=${contentData.contentId!}">${contentData.contentName!}[${contentData.contentId!}]</a></td> + <td><a class="plain" href="/content/control/showContent?contentId=${contentData.contentId!}" target="_blank">${uiLabelMap.CommonView}</a></td> + <td>${contentData.contentTypeId!}</td> + <td>${contentData.mimeTypeId!}</td> + <td>${contentData.statusId!}</td> <#if contentData.caFromDate?has_content> <#assign caFromDate = Static["org.ofbiz.base.util.UtilDateTime"].toDateString(contentData.caFromDate, "dd/MM/yyyy")/> </#if> - <td>${caFromDate?if_exists}</td> + <td>${caFromDate!}</td> <td><a href="javascript:document.listDocumentForm_${listcount}.submit()" >${uiLabelMap.CommonDelete}</a></td> </tr> <form action="<@ofbizUrl>removeDocumentFromTree</@ofbizUrl>" name="listDocumentForm_${listcount}" method="post"> - <input type="hidden" name="contentId" value="${contentData.contentIdStart?if_exists}"/> - <input type="hidden" name="contentIdTo" value="${contentData.contentId?if_exists}"/> - <input type="hidden" name="contentAssocTypeId" value="${contentData.caContentAssocTypeId?if_exists}"/> - <input type="hidden" name="fromDate" value="${contentData.fromDate?if_exists}"/> + <input type="hidden" name="contentId" value="${contentData.contentIdStart!}"/> + <input type="hidden" name="contentIdTo" value="${contentData.contentId!}"/> + <input type="hidden" name="contentAssocTypeId" value="${contentData.caContentAssocTypeId!}"/> + <input type="hidden" name="fromDate" value="${contentData.fromDate!}"/> </form> </#if> <#assign alt_row = !alt_row/> Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Sat Aug 16 11:34:57 2014 @@ -45,9 +45,9 @@ under the License. <#assign alt_row = false> <#list surveyQuestionAndApplList as surveyQuestionAndAppl> <#assign questionType = surveyQuestionAndAppl.getRelatedOne("SurveyQuestionType", true)/> - <#assign questionCat = surveyQuestionAndAppl.getRelatedOne("SurveyQuestionCategory", true)?if_exists/> - <#assign currentSurveyPage = surveyQuestionAndAppl.getRelatedOne("SurveyPage", true)?if_exists/> - <#assign currentSurveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)?if_exists/> + <#assign questionCat = surveyQuestionAndAppl.getRelatedOne("SurveyQuestionCategory", true)!/> + <#assign currentSurveyPage = surveyQuestionAndAppl.getRelatedOne("SurveyPage", true)!/> + <#assign currentSurveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)!/> <#if currentSurveyMultiResp?has_content> <#assign currentSurveyMultiRespColumns = currentSurveyMultiResp.getRelated("SurveyMultiRespColumn", null, null, false)/> <#else/> @@ -61,25 +61,25 @@ under the License. <input type="hidden" name="fromDate" value="${surveyQuestionAndAppl.fromDate}" /> <td>${surveyQuestionAndAppl.surveyQuestionId}</td> <td>${questionType.get("description",locale)}</td> - <td>${(questionCat.description)?if_exists}</td> - <td>${surveyQuestionAndAppl.description?if_exists}</td> - <td><input type="text" name="question" size="30" value="${surveyQuestionAndAppl.question?if_exists?html}" /> + <td>${(questionCat.description)!}</td> + <td>${surveyQuestionAndAppl.description!}</td> + <td><input type="text" name="question" size="30" value="${surveyQuestionAndAppl.question!?html}" /> <td> <select name="surveyPageId"> <#if surveyQuestionAndAppl.surveyPageSeqId?has_content> - <option value="${surveyQuestionAndAppl.surveyPageSeqId}">${(currentSurveyPage.pageName)?if_exists} [${surveyQuestionAndAppl.surveyPageSeqId}]</option> + <option value="${surveyQuestionAndAppl.surveyPageSeqId}">${(currentSurveyPage.pageName)!} [${surveyQuestionAndAppl.surveyPageSeqId}]</option> <option value="${surveyQuestionAndAppl.surveyPageSeqId}">----</option> </#if> <option value=""></option> <#list surveyPageList as surveyPage> - <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName?if_exists} [${surveyPage.surveyPageSeqId}]</option> + <option value="${surveyPage.surveyPageSeqId}">${surveyPage.pageName!} [${surveyPage.surveyPageSeqId}]</option> </#list> </select> </td> <td> <select name="surveyMultiRespId"> <#if surveyQuestionAndAppl.surveyMultiRespId?has_content> - <option value="${surveyQuestionAndAppl.surveyMultiRespId}">${(currentSurveyMultiResp.multiRespTitle)?if_exists} [${surveyQuestionAndAppl.surveyMultiRespId}]</option> + <option value="${surveyQuestionAndAppl.surveyMultiRespId}">${(currentSurveyMultiResp.multiRespTitle)!} [${surveyQuestionAndAppl.surveyMultiRespId}]</option> <option value="${surveyQuestionAndAppl.surveyMultiRespId}">----</option> </#if> <option value=""></option> @@ -93,7 +93,7 @@ under the License. <select name="surveyMultiRespColId"> <#if surveyQuestionAndAppl.surveyMultiRespColId?has_content> <#assign currentSurveyMultiRespColumn = surveyQuestionAndAppl.getRelatedOne("SurveyMultiRespColumn", false)/> - <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${(currentSurveyMultiRespColumn.columnTitle)?if_exists} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option> + <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${(currentSurveyMultiRespColumn.columnTitle)!} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option> <option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">----</option> </#if> <option value=""></option> @@ -103,7 +103,7 @@ under the License. </select> </td> <#else/> - <td><input type="text" name="surveyMultiRespColId" size="4" value="${surveyQuestionAndAppl.surveyMultiRespColId?if_exists}"/></td> + <td><input type="text" name="surveyMultiRespColId" size="4" value="${surveyQuestionAndAppl.surveyMultiRespColId!}"/></td> </#if> <td> <select name="requiredField"> @@ -112,9 +112,9 @@ under the License. <option>Y</option><option>N</option> </select> </td> - <td><input type="text" name="sequenceNum" size="5" value="${surveyQuestionAndAppl.sequenceNum?if_exists}"/></td> - <td><input type="text" name="withSurveyQuestionId" size="5" value="${surveyQuestionAndAppl.withSurveyQuestionId?if_exists}"/></td> - <td><input type="text" name="withSurveyOptionSeqId" size="5" value="${surveyQuestionAndAppl.withSurveyOptionSeqId?if_exists}"/></td> + <td><input type="text" name="sequenceNum" size="5" value="${surveyQuestionAndAppl.sequenceNum!}"/></td> + <td><input type="text" name="withSurveyQuestionId" size="5" value="${surveyQuestionAndAppl.withSurveyQuestionId!}"/></td> + <td><input type="text" name="withSurveyOptionSeqId" size="5" value="${surveyQuestionAndAppl.withSurveyOptionSeqId!}"/></td> <td><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></td> <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${surveyQuestionAndAppl.surveyQuestionId}#edit</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit} ${uiLabelMap.ContentSurveyQuestion}</a></td> </form> @@ -137,7 +137,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ContentSurveyApplyQuestionFromCategory} - ${surveyQuestionCategory.description?if_exists} [${surveyQuestionCategory.surveyQuestionCategoryId}]</li> + <li class="h3">${uiLabelMap.ContentSurveyApplyQuestionFromCategory} - ${surveyQuestionCategory.description!} [${surveyQuestionCategory.surveyQuestionCategoryId}]</li> </ul> <br class="clear"/> </div> @@ -167,9 +167,9 @@ under the License. <input type="hidden" name="surveyQuestionCategoryId" value="${requestParameters.surveyQuestionCategoryId}" /> <tr<#if alt_row> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${question.surveyQuestionId}&surveyQuestionCategoryId=${requestParameters.surveyQuestionCategoryId}#edit</@ofbizUrl>" class="buttontext">${question.surveyQuestionId}</a></td> - <td>${question.description?if_exists}</td> + <td>${question.description!}</td> <td>${questionType.get("description",locale)}</td> - <td>${question.question?if_exists}</td> + <td>${question.question!}</td> <td> <select name="surveyPageId"> <option value=""></option> @@ -267,7 +267,7 @@ under the License. <div class="screenlet"> <div class="screenlet-title-bar"> <ul> - <li class="h3">${uiLabelMap.ContentSurveyOptions} - ${uiLabelMap.CommonId} ${surveyQuestion.surveyQuestionId?if_exists}</li> + <li class="h3">${uiLabelMap.ContentSurveyOptions} - ${uiLabelMap.CommonId} ${surveyQuestion.surveyQuestionId!}</li> </ul> <br class="clear"/> </div> @@ -282,8 +282,8 @@ under the License. <#assign alt_row = false> <#list questionOptions as option> <tr<#if alt_row> class="alternate-row"</#if>> - <td>${option.description?if_exists}</td> - <td>${option.sequenceNum?if_exists}</td> + <td>${option.description!}</td> + <td>${option.sequenceNum!}</td> <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td> <td> <form id="deleteSurveyQuestionOption_${option_index}" action="<@ofbizUrl>deleteSurveyQuestionOption</@ofbizUrl>" method="post"> Modified: ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyResponse.ftl Sat Aug 16 11:34:57 2014 @@ -22,8 +22,8 @@ under the License. <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>updateSurveyResponse</@ofbizUrl>" name="EditSurveyResponseForm" style="margin: 0;"> <div>${uiLabelMap.PartyPartyId}: <@htmlTemplate.lookupField value="${userLogin.partyId}" formName="EditSurveyResponseForm" name="partyId" id="partyId" fieldFormName="LookupPartyName"/> <#-- pass through the dataResourceId so the response can be associated with it --> - <input type="hidden" name="dataResourceId" value="${parameters.dataResourceId?if_exists}"/> - <input type="hidden" name="rootContentId" value="${parameters.rootContentId?if_exists}"/> + <input type="hidden" name="dataResourceId" value="${parameters.dataResourceId!}"/> + <input type="hidden" name="rootContentId" value="${parameters.rootContentId!}"/> ${StringUtil.wrapString(surveyString)} </form> <#else> Modified: ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl Sat Aug 16 11:34:57 2014 @@ -23,12 +23,12 @@ under the License. <#if questions?has_content> <#list questions as question> - <#assign results = surveyResults.get(question.surveyQuestionId)?if_exists> + <#assign results = surveyResults.get(question.surveyQuestionId)!> <tr> <#-- seperator options --> <#if question.surveyQuestionTypeId == "SEPERATOR_TEXT"> - <td colspan="5" class="label">${question.question?if_exists}</td> + <td colspan="5" class="label">${question.question!}</td> <#elseif question.surveyQuestionTypeId == "SEPERATOR_LINE"> <td colspan="5"><hr/></td> <#else> @@ -39,7 +39,7 @@ under the License. <#if (results._total?default(0) == 1)> <#assign answerString = "${uiLabelMap.ContentAnswer}"> </#if> - <div>${question.question?if_exists} (${results._total?default(0)?string.number} ${answerString})</div> + <div>${question.question!} (${results._total?default(0)?string.number} ${answerString})</div> <#if question.hint?has_content> <div>${question.hint}</div> </#if> @@ -57,13 +57,13 @@ under the License. <span style="white-space: nowrap;">${uiLabelMap.CommonN} [${results._no_total?default(0)?string("#")} / ${results._no_percent?default(0)?string("#")}%]</span> </div> <#elseif question.surveyQuestionTypeId == "OPTION"> - <#assign options = question.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> + <#assign options = question.getRelated("SurveyQuestionOption", null, sequenceSort, false)!> <#if options?has_content> <#list options as option> - <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> + <#assign optionResults = results.get(option.surveyOptionSeqId)!> <div> <span style="white-space: nowrap;"> - ${option.description?if_exists} + ${option.description!} [${optionResults._total?default(0)?string("#")} / ${optionResults._percent?default(0?string("#"))}%] </span> </div> @@ -74,21 +74,21 @@ under the License. <#if answers?has_content> <#list answers as answer> <#if question.surveyQuestionTypeId == "TEXTAREA"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "TEXT_SHORT"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "TEXT_LONG"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "EMAIL"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "URL"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "DATE"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "CREDIT_CARD"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "GIFT_CARD"> - <div>${(answer.textResponse)?if_exists}</div> + <div>${(answer.textResponse)!}</div> <#elseif question.surveyQuestionTypeId == "NUMBER_CURRENCY"> <div>${answer.currencyResponse?default(0)}</div> <#elseif question.surveyQuestionTypeId == "NUMBER_FLOAT"> @@ -100,7 +100,7 @@ under the License. <#elseif question.surveyQuestionTypeId == "CONTENT"> <#if answer.contentId?has_content> <#assign content = answer.getRelatedOne("Content", false)> - <a href="<@ofbizUrl>img?imgId=${content.dataResourceId}</@ofbizUrl>" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists} + <a href="<@ofbizUrl>img?imgId=${content.dataResourceId}</@ofbizUrl>" class="buttontext">${answer.contentId}</a> - ${content.contentName!} </#if> </#if> </#list> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Sat Aug 16 11:34:57 2014 @@ -163,7 +163,7 @@ <#if (dataResourceTypeId?has_content)> <form name="cmsform" enctype="multipart/form-data" method="post" action="<@ofbizUrl>${formAction}</@ofbizUrl>" style="margin: 0;"> <#if (content?has_content)> - <input type="hidden" name="dataResourceId" value="${(dataResource.dataResourceId)?if_exists}"/> + <input type="hidden" name="dataResourceId" value="${(dataResource.dataResourceId)!}"/> <input type="hidden" name="contentId" value="${content.contentId}"/> <#list requestParameters.keySet() as paramName> @@ -189,7 +189,7 @@ </#if> </#if> <input type="hidden" name="webSiteId" value="${webSiteId}"/> - <input type="hidden" name="dataResourceName" value="${(dataResource.dataResourceName)?if_exists}"/> + <input type="hidden" name="dataResourceName" value="${(dataResource.dataResourceName)!}"/> <table> <#if (content?has_content)> @@ -201,19 +201,19 @@ <tr> <td class="label">${uiLabelMap.CommonName}</td> <td> - <input type="text" name="contentName" value="${(content.contentName)?if_exists}" size="40"/> + <input type="text" name="contentName" value="${(content.contentName)!}" size="40"/> </td> </tr> <tr> <td class="label">${uiLabelMap.CommonDescription}</td> <td> - <textarea name="description" cols="40" rows="6">${(content.description)?if_exists}</textarea> + <textarea name="description" cols="40" rows="6">${(content.description)!}</textarea> </td> </tr> <tr> <td class="label">${uiLabelMap.ContentMapKey}</td> <td> - <input type="text" name="mapKey" value="${(assoc.mapKey)?if_exists}" size="40"/> + <input type="text" name="mapKey" value="${(assoc.mapKey)!}" size="40"/> </td> </tr> <tr> @@ -237,7 +237,7 @@ <tr> <td class="label">${uiLabelMap.CommonSequenceNum}</td> <td> - <input type="text" name="sequenceNum" value="${(currentPurpose.sequenceNum)?if_exists}" size="5" /> + <input type="text" name="sequenceNum" value="${(currentPurpose.sequenceNum)!}" size="5" /> </td> </tr> <tr> @@ -246,7 +246,7 @@ <select name="dataTemplateTypeId"> <#if (dataResource?has_content)> <#if (dataResource.dataTemplateTypeId?has_content)> - <#assign thisType = dataResource.getRelatedOne("DataTemplateType", false)?if_exists/> + <#assign thisType = dataResource.getRelatedOne("DataTemplateType", false)!/> <option value="${thisType.dataTemplateTypeId}">${thisType.description}</option> <option value="${thisType.dataTemplateTypeId}">----</option> </#if> @@ -282,7 +282,7 @@ <#if (content?has_content)> <#if (content.templateDataResourceId?has_content && content.templateDataResourceId != "NONE")> <#assign template = content.getRelatedOne("TemplateDataResource", false)/> - <option value="${template.dataResourceId}">${template.dataResourceName?if_exists}</option> + <option value="${template.dataResourceId}">${template.dataResourceName!}</option> <option value="${template.dataResourceId}">----</option> </#if> </#if> @@ -359,14 +359,14 @@ <tr> <td class="label">${uiLabelMap.ContentUrl}</td> <td> - <input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/> + <input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)!}"/> </td> </tr> <#elseif (dataResourceTypeId == 'SHORT_TEXT')> <tr> <td class="label">${uiLabelMap.ContentText}</td> <td> - <input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)?if_exists}"/> + <input type="text" name="objectInfo" size="40" maxsize="255" value="${(dataResource.objectInfo)!}"/> </td> </tr> <#elseif (dataResourceTypeId == 'ELECTRONIC_TEXT')> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSMeta.ftl Sat Aug 16 11:34:57 2014 @@ -22,8 +22,8 @@ <input type="hidden" name="dataResourceTypeId" value="SHORT_TEXT"/> <input type="hidden" name="contentAssocTypeId" value="SUB_CONTENT"/> <input type="hidden" name="statusId" value="CTNT_PUBLISHED"/> - <input type="hidden" name="ownerContentId" value="${(content.contentId)?if_exists}"/> - <input type="hidden" name="contentIdFrom" value="${(content.contentId)?if_exists}"/> + <input type="hidden" name="ownerContentId" value="${(content.contentId)!}"/> + <input type="hidden" name="contentIdFrom" value="${(content.contentId)!}"/> </#macro> <#-- cms menu bar --> @@ -107,19 +107,19 @@ <table> <tr> <td class="label">Page Title</td> - <td><input type="text" name="title" value="${(title.objectInfo)?if_exists}" size="40" /></td> + <td><input type="text" name="title" value="${(title.objectInfo)!}" size="40" /></td> </tr> <tr> <td class="label">Title Property</td> - <td><input type="text" name="titleProperty" value="${(titleProperty.objectInfo)?if_exists}" size="40" /></td> + <td><input type="text" name="titleProperty" value="${(titleProperty.objectInfo)!}" size="40" /></td> </tr> <tr> <td class="label">Meta-Description</td> - <td><input type="text" name="metaDescription" value="${(metaDescription.objectInfo)?if_exists}" size="40" /></td> + <td><input type="text" name="metaDescription" value="${(metaDescription.objectInfo)!}" size="40" /></td> </tr> <tr> <td class="label">Meta-Keywords</td> - <td><input type="text" name="metaKeywords" value="${(metaKeywords.objectInfo)?if_exists}" size="40" /></td> + <td><input type="text" name="metaKeywords" value="${(metaKeywords.objectInfo)!}" size="40" /></td> </tr> <tr><td colspan="2"> </td></tr> <tr> Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original) +++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Sat Aug 16 11:34:57 2014 @@ -28,8 +28,8 @@ jQuery(document).ready(loadTrees); jQuery(document).ready(createEditor); - var contentRoot = '${contentRoot?if_exists}'; - var webSiteId = '${webSiteId?if_exists}'; + var contentRoot = '${contentRoot!}'; + var webSiteId = '${webSiteId!}'; var editorUrl = '<@ofbizUrl>/views/WebSiteCMSContent</@ofbizUrl>'; var aliasUrl = '<@ofbizUrl>/views/WebSiteCMSPathAlias</@ofbizUrl>'; var metaUrl = '<@ofbizUrl>/views/WebSiteCMSMetaInfo</@ofbizUrl>'; @@ -53,7 +53,7 @@ { "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', jQuery('#${assoc.contentIdTo}'), '');"}}, - <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)?if_exists/> + <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)!/> "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}", "contentAssocTypeId" : "${assoc.contentAssocTypeId}"} <#if assocChilds?has_content> ,"children": [ @@ -74,7 +74,7 @@ <#assign content = assoc.getRelatedOne("ToContent", false)/> { "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('${assoc.contentIdTo}');"}}, - <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)?if_exists/> + <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)!/> "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"} <#if assocChilds?has_content> ,"children": [ @@ -96,7 +96,7 @@ <#assign content = assoc.getRelatedOne("ToContent", false)/> { "data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', '', '');"}}, - <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)?if_exists/> + <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)!/> "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"} <#if assocChilds?has_content> ,"children": [ Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/category/CategoryTree.ftl Sat Aug 16 11:34:57 2014 @@ -35,9 +35,9 @@ var rawdata = [ <#if (rootCat?has_content)> <#list rootCat as root> { - "data": {"title" : unescapeHtmlText("<#if root.groupName?exists>${root.groupName?js_string} [${root.partyId}]<#else>${root.partyId?js_string}</#if>"), "attr": {"href" : "<@ofbizUrl>/viewprofile?partyId=${root.partyId}</@ofbizUrl>","onClick" : "callDocument('${root.partyId}');"}}, + "data": {"title" : unescapeHtmlText("<#if root.groupName??>${root.groupName?js_string} [${root.partyId}]<#else>${root.partyId?js_string}</#if>"), "attr": {"href" : "<@ofbizUrl>/viewprofile?partyId=${root.partyId}</@ofbizUrl>","onClick" : "callDocument('${root.partyId}');"}}, "attr": {"id" : "${root.partyId}", "rel" : "Y"} - <#if root.child?exists> + <#if root.child??> ,"state" : "closed" </#if> <#if root_has_next> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl Sat Aug 16 11:34:57 2014 @@ -26,7 +26,7 @@ under the License. <#if parameters.hideFields?default("N") == "Y"> <li><a href="<@ofbizUrl>findEmployees?hideFields=N${paramList}</@ofbizUrl>">${uiLabelMap.CommonShowLookupFields}</a></li> <#else> - <#if partyList?exists><li><a href="<@ofbizUrl>findEmployees?hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li></#if> + <#if partyList??><li><a href="<@ofbizUrl>findEmployees?hideFields=Y${paramList}</@ofbizUrl>">${uiLabelMap.CommonHideFields}</a></li></#if> <li><a href="javascript:document.lookupparty.submit();">${uiLabelMap.PartyLookupParty}</a></li> </#if> </ul> @@ -52,30 +52,30 @@ under the License. </tr> <tr><td class='label'>${uiLabelMap.PartyPartyId}</td> <td> - <@htmlTemplate.lookupField value='${requestParameters.partyId?if_exists}' formName="lookupparty" name="partyId" id="partyId" fieldFormName="LookupPerson"/> + <@htmlTemplate.lookupField value='${requestParameters.partyId!}' formName="lookupparty" name="partyId" id="partyId" fieldFormName="LookupPerson"/> </td> </tr> <tr><td class="label">${uiLabelMap.PartyUserLogin}</td> - <td><input type="text" name="userLoginId" value="${parameters.userLoginId?if_exists}"/></td> + <td><input type="text" name="userLoginId" value="${parameters.userLoginId!}"/></td> </tr> <tr><td class="label">${uiLabelMap.PartyLastName}</td> - <td><input type="text" name="lastName" value="${parameters.lastName?if_exists}"/></td> + <td><input type="text" name="lastName" value="${parameters.lastName!}"/></td> </tr> <tr><td class="label">${uiLabelMap.PartyFirstName}</td> - <td><input type="text" name="firstName" value="${parameters.firstName?if_exists}"/></td> + <td><input type="text" name="firstName" value="${parameters.firstName!}"/></td> </tr> - <tr><td><input type="hidden" name="groupName" value="${parameters.groupName?if_exists}"/></td></tr> + <tr><td><input type="hidden" name="groupName" value="${parameters.groupName!}"/></td></tr> <tr><td><input type="hidden" name="roleTypeId" value="EMPLOYEE"/></td></tr> <#if extInfo == "P"> <tr><td colspan="3"><hr /></td></tr><tr> <td class="label">${uiLabelMap.CommonAddress1}</td> - <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td> + <td><input type="text" name="address1" value="${parameters.address1!}"/></td> </tr> <tr><td class="label">${uiLabelMap.CommonAddress2}</td> - <td><input type="text" name="address2" value="${parameters.address2?if_exists}"/></td> + <td><input type="text" name="address2" value="${parameters.address2!}"/></td> </tr> <tr><td class="label">${uiLabelMap.CommonCity}</td> - <td><input type="text" name="city" value="${parameters.city?if_exists}"/></td> + <td><input type="text" name="city" value="${parameters.city!}"/></td> </tr> <tr><td class="label">${uiLabelMap.CommonStateProvince}</td> <td><select name="stateProvinceGeoId"> @@ -89,25 +89,25 @@ under the License. </td> </tr> <tr><td class="label">${uiLabelMap.PartyPostalCode}</td> - <td><input type="text" name="postalCode" value="${parameters.postalCode?if_exists}"/></td> + <td><input type="text" name="postalCode" value="${parameters.postalCode!}"/></td> </tr> </#if> <#if extInfo == "T"> <tr><td colspan="3"><hr /></td></tr> <tr><td class="label">${uiLabelMap.CommonCountryCode}</td> - <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td> + <td><input type="text" name="countryCode" value="${parameters.countryCode!}"/></td> </tr> <tr><td class="label">${uiLabelMap.PartyAreaCode}</td> - <td><input type="text" name="areaCode" value="${parameters.areaCode?if_exists}"/></td> + <td><input type="text" name="areaCode" value="${parameters.areaCode!}"/></td> </tr> <tr><td class="label">${uiLabelMap.PartyContactNumber}</td> - <td><input type="text" name="contactNumber" value="${parameters.contactNumber?if_exists}"/></td> + <td><input type="text" name="contactNumber" value="${parameters.contactNumber!}"/></td> </tr> </#if> <#if extInfo == "O"> <tr><td colspan="3"><hr /></td></tr> <tr><td class="label">${uiLabelMap.PartyContactInformation}</td> - <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td> + <td><input type="text" name="infoString" value="${parameters.infoString!}"/></td> </tr> </#if> <tr><td colspan="3"><hr /></td></tr> @@ -129,7 +129,7 @@ under the License. //--> </script> </#if> - <#if partyList?exists> + <#if partyList??> <br /> <div id="findEmployeeResults" class="screenlet"> <div class="screenlet-title-bar"> @@ -171,7 +171,7 @@ under the License. </tr> <#assign alt_row = false> <#list partyList as partyRow> - <#assign partyType = partyRow.getRelatedOne("PartyType", false)?if_exists> + <#assign partyType = partyRow.getRelatedOne("PartyType", false)!> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> <td><a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${partyRow.partyId}</a></td> <td><#if partyRow.containsKey("userLoginId")> @@ -204,15 +204,15 @@ under the License. </#if> </td> <#if extInfo?default("") == "T"> - <td>${partyRow.areaCode?if_exists}</td> + <td>${partyRow.areaCode!}</td> </#if> <#if extInfo?default("") == "P" > - <td>${partyRow.city?if_exists}, ${partyRow.stateProvinceGeoId?if_exists}</td> + <td>${partyRow.city!}, ${partyRow.stateProvinceGeoId!}</td> </#if> <#if extInfo?default("") == "P"> - <td>${partyRow.postalCode?if_exists}</td> + <td>${partyRow.postalCode!}</td> </#if> - <td><#if partyType.description?exists>${partyType.get("description", locale)}<#else>???</#if></td> + <td><#if partyType.description??>${partyType.get("description", locale)}<#else>???</#if></td> <td class="button-col align-float"> <a href="<@ofbizUrl>EmployeeProfile?partyId=${partyRow.partyId}</@ofbizUrl>">${uiLabelMap.CommonDetails}</a> </td> @@ -226,7 +226,7 @@ under the License. <span class="h3">${uiLabelMap.PartyNoPartiesFound}</span> </div> </#if> - <#if lookupErrorMessage?exists> + <#if lookupErrorMessage??> <div><h3>${lookupErrorMessage}</h3></div> </#if> <div> </div> Modified: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl (original) +++ ofbiz/trunk/applications/humanres/webapp/humanres/humanres/internalorg/removeinternalorg.ftl Sat Aug 16 11:34:57 2014 @@ -16,13 +16,13 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<#assign partyGroup = delegator.findOne("PartyGroup", {"partyId" : parameters.partyId?if_exists}, true)/> +<#assign partyGroup = delegator.findOne("PartyGroup", {"partyId" : parameters.partyId!}, true)/> <#if partyGroup?has_content> - <#assign partyname = partyGroup.groupName?if_exists/> + <#assign partyname = partyGroup.groupName!/> </#if> <script type="text/javascript"> <!-- - var answer = confirm ("Are you sure you want to remove '<#if partyname?exists>${partyname}<#else>${parameters.partyId?if_exists}</#if>'?") + var answer = confirm ("Are you sure you want to remove '<#if partyname??>${partyname}<#else>${parameters.partyId!}</#if>'?") if (answer) document.removeInternalOrg.submit(); else @@ -31,7 +31,7 @@ under the License. </script> <div id="rmvinternalorg" title="Remove Internal Organization"> <form name="removeInternalOrg" method="post" action="<@ofbizUrl>removeInternalOrg</@ofbizUrl>"> - <input type="hidden" name="partyId" value="${parameters.partyId?if_exists}"/> - <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId?if_exists}"/> + <input type="hidden" name="partyId" value="${parameters.partyId!}"/> + <input type="hidden" name="parentpartyId" value="${parameters.parentpartyId!}"/> </form> </div> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=1618336&r1=1618335&r2=1618336&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Sat Aug 16 11:34:57 2014 @@ -28,7 +28,7 @@ under the License. </div> <div class="screenlet-body"> <#list selectedFeatures as selectedFeature> - <p>${selectedFeature.productFeatureTypeId} = ${selectedFeature.description?if_exists} [${selectedFeature.productFeatureId}]</p> + <p>${selectedFeature.productFeatureTypeId} = ${selectedFeature.description!} [${selectedFeature.productFeatureId}]</p> </#list> <#else> <div class="screenlet"> @@ -79,11 +79,11 @@ under the License. <#if node.product.isVirtual?default("N") == "Y"> ${node.product.isVirtual} </#if> - ${(node.ruleApplied.ruleId)?if_exists} + ${(node.ruleApplied.ruleId)!} </td> <td>${node.product.internalName?default(" ")}</td> <td align="right">${node.quantity}</td> - <td align="right"><a href="<@ofbizUrl>EditProductBom?productId=${(node.product.productId)?if_exists}&productAssocTypeId=${(node.bomTypeId)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td> + <td align="right"><a href="<@ofbizUrl>EditProductBom?productId=${(node.product.productId)!}&productAssocTypeId=${(node.bomTypeId)!}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a></td> </tr> <#-- toggle the row color --> <#assign alt_row = !alt_row> @@ -113,20 +113,20 @@ under the License. <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${node.product.productId}</a></td> <td>${node.product.internalName?default(" ")}</td> <td align="right">${node.quantity}</td> - <td align="right">${productData.qoh?if_exists}</td> - <td align="right">${node.product.productWeight?if_exists}</td> - <#if productData.unitCost?exists && (productData.unitCost > 0)> - <td align="right">${productData.unitCost?if_exists}</td> + <td align="right">${productData.qoh!}</td> + <td align="right">${node.product.productWeight!}</td> + <#if productData.unitCost?? && (productData.unitCost > 0)> + <td align="right">${productData.unitCost!}</td> <#else> <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">NA</a></td> </#if> - <td align="right">${productData.totalCost?if_exists}</td> + <td align="right">${productData.totalCost!}</td> </tr> <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> <#-- - <#if grandTotalCost?exists> + <#if grandTotalCost??> <tr> <td colspan="6" align="right">${grandTotalCost}</td> </tr> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |