ContentServicesComplex.getAssocAndContentAndDataResourceCacheMethod was not using the passed contentId in condition list, and also was not using the ContentAssocDataResourceViewFrom/To view entity to get the result. Thanks to Deepak Dixit for the patch. Misc minor cleanups (removed commented out code) and some small formatting fixes. git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1643061 13f79535-47bb-0310-9956-ffa450edef68
26 lines
1.0 KiB
Plaintext
26 lines
1.0 KiB
Plaintext
<#--
|
|
Licensed to the Apache Software Foundation (ASF) under one
|
|
or more contributor license agreements. See the NOTICE file
|
|
distributed with this work for additional information
|
|
regarding copyright ownership. The ASF licenses this file
|
|
to you under the Apache License, Version 2.0 (the
|
|
"License"); you may not use this file except in compliance
|
|
with the License. You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing,
|
|
software distributed under the License is distributed on an
|
|
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
KIND, either express or implied. See the License for the
|
|
specific language governing permissions and limitations
|
|
under the License.
|
|
-->
|
|
|
|
${(decoratedContent.subcontent.htmlHead)?default((thisContent.subcontent.htmlHead)!)}
|
|
${(decoratedContent.subcontent.header)?default((thisContent.subcontent.header)!)}
|
|
|
|
${decoratedContent}
|
|
|
|
${(decoratedContent.subcontent.footer)?default((thisContent.subcontent.footer)!)}
|