You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/29 06:12:05 UTC
svn commit: r1343481 - in /ofbiz/trunk/applications/content:
src/org/ofbiz/content/ src/org/ofbiz/content/content/
src/org/ofbiz/content/webapp/ftl/ template/survey/
webapp/content/WEB-INF/actions/website/ webapp/content/survey/
webapp/content/website/
Author: doogie
Date: Tue May 29 04:12:04 2012
New Revision: 1343481
URL: http://svn.apache.org/viewvc?rev=1343481&view=rev
Log:
DEPRECATION: applications/content: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy
ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy
ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl
ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Tue May 29 04:12:04 2012
@@ -658,7 +658,7 @@ public class ContentManagementWorker {
String userName = null;
Delegator delegator = (Delegator)request.getAttribute("delegator");
GenericValue userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId", userLoginId), true);
- GenericValue person = userLogin.getRelatedOneCache("Person");
+ GenericValue person = userLogin.getRelatedOne("Person", true);
userName = person.getString("firstName") + " " + person.getString("lastName");
return userName;
}
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java Tue May 29 04:12:04 2012
@@ -528,11 +528,7 @@ public class ContentMapFacade implements
// get the data resource value object
GenericValue dr = null;
try {
- if (cache) {
- dr = value.getRelatedOneCache("DataResource");
- } else {
- dr = value.getRelatedOne("DataResource");
- }
+ dr = value.getRelatedOne("DataResource", cache);
} catch (GenericEntityException e) {
Debug.logError(e, module);
}
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Tue May 29 04:12:04 2012
@@ -279,7 +279,7 @@ public class ContentServicesComplex {
List<GenericValue> contentAssocDataResourceList = FastList.newInstance();
Locale locale = Locale.getDefault(); // TODO: this needs to be passed in
for(GenericValue contentAssoc : contentAssocsTypeFiltered) {
- content = contentAssoc.getRelatedOneCache(assocRelationName);
+ content = contentAssoc.getRelatedOne(assocRelationName, true);
if (UtilValidate.isNotEmpty(contentTypes)) {
String contentTypeId = (String)content.get("contentTypeId");
if (contentTypes.contains(contentTypeId)) {
@@ -295,7 +295,7 @@ public class ContentServicesComplex {
//contentAssocDataResourceView.setAllFields(contentAssoc, false, null, null);
String dataResourceId = content.getString("dataResourceId");
if (UtilValidate.isNotEmpty(dataResourceId))
- dataResource = content.getRelatedOneCache("DataResource");
+ dataResource = content.getRelatedOne("DataResource", true);
//if (Debug.infoOn()) Debug.logInfo("dataResource:" + dataResource, module);
//if (Debug.infoOn()) Debug.logInfo("contentAssocDataResourceView:" + contentAssocDataResourceView, module);
if (dataResource != null) {
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/content/ContentWorker.java Tue May 29 04:12:04 2012
@@ -163,7 +163,7 @@ public class ContentWorker implements or
GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelatedByAndCache("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId))));
GenericValue altContent = null;
if (UtilValidate.isNotEmpty(altContentRole)) {
- altContent = altContentRole.getRelatedOneCache("Content");
+ altContent = altContentRole.getRelatedOne("Content", true);
if (altContent != null) {
content = altContent;
}
@@ -507,7 +507,7 @@ public class ContentWorker implements or
boolean isFollow = checkWhen(assocContext, (String) whenMap.get("followWhen"));
if (isFollow) {
- GenericValue thisContent = assocValue.getRelatedOne(assocRelation);
+ GenericValue thisContent = assocValue.getRelatedOne(assocRelation, false);
traverse(delegator, thisContent, fromDate, thruDate, whenMap, depthIdx + 1, thisNode, contentAssocTypeId, pickList, relatedDirection);
}
}
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Tue May 29 04:12:04 2012
@@ -94,7 +94,7 @@ public class LoopSubContentTransform imp
ctx.put("subContentDataResourceView", subContentDataResourceView);
GenericValue electronicText = null;
try {
- electronicText = subContentDataResourceView.getRelatedOne("ElectronicText");
+ electronicText = subContentDataResourceView.getRelatedOne("ElectronicText", false);
} catch (GenericEntityException e) {
throw new RuntimeException(e.getMessage());
}
Modified: ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl (original)
+++ ofbiz/trunk/applications/content/template/survey/genericsurvey.ftl Tue May 29 04:12:04 2012
@@ -68,7 +68,7 @@ under the License.
<input type="password" size="30" class="textBox" name="${questionFieldName}" value="${(answer.textResponse)?default(defValue?if_exists)}" />
<#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "CONTENT"/>
<#if (answer.contentId)?has_content>
- <#assign content = answer.getRelatedOne("Content")>
+ <#assign content = answer.getRelatedOne("Content", false)>
<a href="/content/control/img?imgId=${content.dataResourceId}" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists}
</#if>
<input type="file" size="15" name="${questionFieldName}" class="inputBox"/>
@@ -176,7 +176,7 @@ under the License.
<#-- Get and setup MultiResp info for this question -->
<#assign openMultiRespHeader = false/>
<#assign closeMultiRespHeader = false/>
- <#assign surveyMultiResp = surveyQuestionAndAppl.getRelatedOneCache("SurveyMultiResp")?if_exists/>
+ <#assign surveyMultiResp = surveyQuestionAndAppl.getRelatedOne("SurveyMultiResp", true)?if_exists/>
<#if surveyMultiResp?has_content>
<#assign surveyMultiRespColumnList = surveyMultiResp.getRelatedCache("SurveyMultiRespColumn", Static["org.ofbiz.base.util.UtilMisc"].toList("sequenceNum"))/>
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy Tue May 29 04:12:04 2012
@@ -23,9 +23,9 @@ if (webSite) {
webSiteRoles.each { webSiteRole ->
Map webSiteRoleData = [:];
webSiteRoleData.webSiteRole = webSiteRole;
- webSiteRoleData.person = webSiteRole.getRelatedOne("Person");
- webSiteRoleData.partyGroup = webSiteRole.getRelatedOne("PartyGroup");
- webSiteRoleData.roleType = webSiteRole.getRelatedOneCache("RoleType");
+ webSiteRoleData.person = webSiteRole.getRelatedOne("Person", false);
+ webSiteRoleData.partyGroup = webSiteRole.getRelatedOne("PartyGroup", false);
+ webSiteRoleData.roleType = webSiteRole.getRelatedOne("RoleType", true);
webSiteRoleDatas.add(webSiteRoleData);
}
}
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy Tue May 29 04:12:04 2012
@@ -27,8 +27,8 @@ if (content) {
titles = EntityUtil.filterByDate(titles);
title = EntityUtil.getFirst(titles);
if (title) {
- tc = title.getRelatedOne("ToContent");
- tcdr = tc.getRelatedOne("DataResource");
+ tc = title.getRelatedOne("ToContent", false);
+ tcdr = tc.getRelatedOne("DataResource", false);
context.title = tcdr;
}
@@ -36,8 +36,8 @@ if (content) {
titleProps = EntityUtil.filterByDate(titleProps);
titleProp = EntityUtil.getFirst(titleProps);
if (titleProp) {
- tpc = titleProp.getRelatedOne("ToContent");
- tpcdr = tpc.getRelatedOne("DataResource");
+ tpc = titleProp.getRelatedOne("ToContent", false);
+ tpcdr = tpc.getRelatedOne("DataResource", false);
context.titleProperty = tpcdr;
}
@@ -45,8 +45,8 @@ if (content) {
metaDescs = EntityUtil.filterByDate(metaDescs);
metaDesc = EntityUtil.getFirst(metaDescs);
if (metaDesc) {
- mdc = metaDesc.getRelatedOne("ToContent");
- mdcdr = mdc.getRelatedOne("DataResource");
+ mdc = metaDesc.getRelatedOne("ToContent", false);
+ mdcdr = mdc.getRelatedOne("DataResource", false);
context.metaDescription = mdcdr;
}
@@ -54,8 +54,8 @@ if (content) {
metaKeys = EntityUtil.filterByDate(metaKeys);
metaKey = EntityUtil.getFirst(metaKeys);
if (metaKey) {
- mkc = metaKey.getRelatedOne("ToContent");
- mkcdr = mkc.getRelatedOne("DataResource");
+ mkc = metaKey.getRelatedOne("ToContent", false);
+ mkcdr = mkc.getRelatedOne("DataResource", false);
context.metaKeywords = mkcdr;
}
}
Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy?rev=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy (original)
+++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy Tue May 29 04:12:04 2012
@@ -25,7 +25,7 @@ webSiteContents = delegator.findList("We
webSiteContents = EntityUtil.filterByDate(webSiteContents);
webSiteContent = EntityUtil.getFirst(webSiteContents);
if (webSiteContent) {
- content = webSiteContent.getRelatedOne("Content");
+ content = webSiteContent.getRelatedOne("Content", false);
contentRoot = content.contentId;
context.content = content;
context.contentRoot = contentRoot;
@@ -39,7 +39,7 @@ mnlookupMap = [webSiteId : webSiteId, we
webSiteMenus = delegator.findList("WebSiteContent", EntityCondition.makeCondition(mnlookupMap), null, ['-fromDate'], null, false);
webSiteMenu = EntityUtil.getFirst(webSiteMenus);
if (webSiteMenu) {
- menu = webSiteMenu.getRelatedOne("Content");
+ menu = webSiteMenu.getRelatedOne("Content", false);
menuRoot = menu.contentId;
context.menu = menu;
context.menuRoot = menuRoot;
@@ -53,7 +53,7 @@ erlookupMap = [webSiteId : webSiteId, we
webSiteErrors = delegator.findList("WebSiteContent", EntityCondition.makeCondition(erlookupMap), null, ['-fromDate'], null, false);
webSiteError = EntityUtil.getFirst(webSiteErrors);
if (webSiteError) {
- error = webSiteError.getRelatedOne("Content");
+ error = webSiteError.getRelatedOne("Content", false);
errorRoot = error.contentId;
context.error = error;
context.errorRoot = errorRoot;
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=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Tue May 29 04:12:04 2012
@@ -44,10 +44,10 @@ under the License.
</tr>
<#assign alt_row = false>
<#list surveyQuestionAndApplList as surveyQuestionAndAppl>
- <#assign questionType = surveyQuestionAndAppl.getRelatedOneCache("SurveyQuestionType")/>
- <#assign questionCat = surveyQuestionAndAppl.getRelatedOneCache("SurveyQuestionCategory")?if_exists/>
- <#assign currentSurveyPage = surveyQuestionAndAppl.getRelatedOneCache("SurveyPage")?if_exists/>
- <#assign currentSurveyMultiResp = surveyQuestionAndAppl.getRelatedOneCache("SurveyMultiResp")?if_exists/>
+ <#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/>
<#if currentSurveyMultiResp?has_content>
<#assign currentSurveyMultiRespColumns = currentSurveyMultiResp.getRelated("SurveyMultiRespColumn")/>
<#else/>
@@ -92,7 +92,7 @@ under the License.
<td>
<select name="surveyMultiRespColId">
<#if surveyQuestionAndAppl.surveyMultiRespColId?has_content>
- <#assign currentSurveyMultiRespColumn = surveyQuestionAndAppl.getRelatedOne("SurveyMultiRespColumn")/>
+ <#assign currentSurveyMultiRespColumn = surveyQuestionAndAppl.getRelatedOne("SurveyMultiRespColumn", false)/>
<option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">${(currentSurveyMultiRespColumn.columnTitle)?if_exists} [${currentSurveyMultiRespColumn.surveyMultiRespColId}]</option>
<option value="${currentSurveyMultiRespColumn.surveyMultiRespColId}">----</option>
</#if>
@@ -160,7 +160,7 @@ under the License.
</tr>
<#assign alt_row = false>
<#list categoryQuestions as question>
- <#assign questionType = question.getRelatedOne("SurveyQuestionType")>
+ <#assign questionType = question.getRelatedOne("SurveyQuestionType", false)>
<form method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="surveyId" value="${requestParameters.surveyId}" />
<input type="hidden" name="surveyQuestionId" value="${question.surveyQuestionId}" />
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=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/survey/ViewSurveyResponses.ftl Tue May 29 04:12:04 2012
@@ -99,7 +99,7 @@ under the License.
<div>${uiLabelMap.CommonNotShown}</div>
<#elseif question.surveyQuestionTypeId == "CONTENT">
<#if answer.contentId?has_content>
- <#assign content = answer.getRelatedOne("Content")>
+ <#assign content = answer.getRelatedOne("Content", false)>
<a href="<@o...@ofbizUrl>" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists}
</#if>
</#if>
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=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Tue May 29 04:12:04 2012
@@ -221,7 +221,7 @@
<td>
<select name="contentPurposeTypeId">
<#if (currentPurpose?has_content)>
- <#assign purpose = currentPurpose.getRelatedOne("ContentPurposeType")/>
+ <#assign purpose = currentPurpose.getRelatedOne("ContentPurposeType", false)/>
<option value="${purpose.contentPurposeTypeId}">${purpose.description?default(purpose.contentPurposeTypeId)}</option>
<option value="${purpose.contentPurposeTypeId}">----</option>
<#else>
@@ -246,7 +246,7 @@
<select name="dataTemplateTypeId">
<#if (dataResource?has_content)>
<#if (dataResource.dataTemplateTypeId?has_content)>
- <#assign thisType = dataResource.getRelatedOne("DataTemplateType")?if_exists/>
+ <#assign thisType = dataResource.getRelatedOne("DataTemplateType", false)?if_exists/>
<option value="${thisType.dataTemplateTypeId}">${thisType.description}</option>
<option value="${thisType.dataTemplateTypeId}">----</option>
</#if>
@@ -263,7 +263,7 @@
<select name="decoratorContentId">
<#if (content?has_content)>
<#if (content.decoratorContentId?has_content)>
- <#assign thisDec = content.getRelatedOne("DecoratorContent")/>
+ <#assign thisDec = content.getRelatedOne("DecoratorContent", false)/>
<option value="${thisDec.contentId}">${thisDec.contentName}</option>
<option value="${thisDec.contentId}">----</option>
</#if>
@@ -281,7 +281,7 @@
<select name="templateDataResourceId">
<#if (content?has_content)>
<#if (content.templateDataResourceId?has_content && content.templateDataResourceId != "NONE")>
- <#assign template = content.getRelatedOne("TemplateDataResource")/>
+ <#assign template = content.getRelatedOne("TemplateDataResource", false)/>
<option value="${template.dataResourceId}">${template.dataResourceName?if_exists}</option>
<option value="${template.dataResourceId}">----</option>
</#if>
@@ -299,7 +299,7 @@
<select name="statusId">
<#if (content?has_content)>
<#if (content.statusId?has_content)>
- <#assign statusItem = content.getRelatedOne("StatusItem")/>
+ <#assign statusItem = content.getRelatedOne("StatusItem", false)/>
<option value="${statusItem.statusId}">${statusItem.description}</option>
<option value="${statusItem.statusId}">----</option>
</#if>
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=1343481&r1=1343480&r2=1343481&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Tue May 29 04:12:04 2012
@@ -49,7 +49,7 @@
<#macro fillTreeSubsites assocList>
<#if (assocList?has_content)>
<#list assocList as assoc>
- <#assign content = assoc.getRelatedOne("ToContent")/>
+ <#assign content = assoc.getRelatedOne("ToContent", false)/>
{
"data": {"title" : cutNameLength("${content.contentName!assoc.contentIdTo}"), "attr": {"href": "javascript:void(0);", "onClick" : "callDocument('', '${assoc.contentIdTo}', jQuery('#${assoc.contentIdTo}'), '');"}},
@@ -71,7 +71,7 @@
<#macro fillTreeMenus assocList>
<#if (assocList?has_content)>
<#list assocList as assoc>
- <#assign content = assoc.getRelatedOne("ToContent")/>
+ <#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")?if_exists/>
@@ -93,7 +93,7 @@
<#macro fillTreeError assocList>
<#if (assocList?has_content)>
<#list assocList as assoc>
- <#assign content = assoc.getRelatedOne("ToContent")/>
+ <#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")?if_exists/>