svn commit: r1821028 [1/3] - in /ofbiz/ofbiz-framework/trunk/applications: content/template/content/ content/template/website/ product/config/ product/groovyScripts/facility/facility/ product/widget/facility/ workeffort/minilang/workeffort/

Author: jleroux
Date: Fri Jan 12 20:06:03 2018
New Revision: 1821028

URL: http://svn.apache.org/viewvc?rev=1821028&view=rev
Log:
Reverts from r1821001 (for OFBIZ-10113) some unrelated files (pending changes)
that inadvertently slipped in.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl
    ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/config/ProductUiLabels.xml
    ofbiz/ofbiz-framework/trunk/applications/product/groovyScripts/facility/facility/FindFacility.groovy
    ofbiz/ofbiz-framework/trunk/applications/product/widget/facility/FacilityScreens.xml
    ofbiz/ofbiz-framework/trunk/applications/workeffort/minilang/workeffort/WorkEffortSimpleServices.xml

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl?rev=1821028&r1=1821027&r2=1821028&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/content/ContentSearchOptions.ftl Fri Jan 12 20:06:03 2018
@@ -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!}" 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>

Modified: ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl?rev=1821028&r1=1821027&r2=1821028&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/content/template/website/WebSiteCMSContent.ftl Fri Jan 12 20:06:03 2018
@@ -154,14 +154,11 @@
     <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)!}"/>
-            <input type="hidden" name="contentIdTo" value="${content.contentId}"/>
+            <input type="hidden" name="contentId" value="${content.contentId}"/>
 
             <#list requestParameters.keySet() as paramName>
-                <#if paramName == 'contentIdFrom'>
-                  <input type="hidden" name="contentId" value="${requestParameters.get(paramName)}"/>
-                </#if>
-                <#if (paramName == 'contentAssocTypeId' || paramName == 'fromDate')>
-                  <input type="hidden" name="${paramName}" value="${requestParameters.get(paramName)}"/>
+                <#if (paramName == 'contentIdFrom' || paramName == 'contentAssocTypeId' || paramName == 'fromDate')>
+                    <input type="hidden" name="${paramName}" value="${requestParameters.get(paramName)}"/>
                 </#if>
             </#list>
         <#else>