svn commit: r1351866 [10/48] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1351866 [10/48] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/ofbiz-component.xml Tue Jun 19 21:36:11 2012 @@ -36,7 +36,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/DataCategoryData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/BlogSeedData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/TemplateData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentSecurityData.xml"/> + <entity-resource type="data" reader-name="security" loader="main" location="data/ContentSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/MiscData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ContentHttpErrorData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/script/org/ofbiz/content/survey/SurveyServices.xml Tue Jun 19 21:36:11 2012 @@ -282,7 +282,6 @@ </check-permission> <check-errors/> <entity-one entity-name="SurveyQuestionOption" value-field="lookedUpValue"/> - <set-pk-fields map="parameters" value-field="lookupKeyValue"/> <set-nonpk-fields map="parameters" value-field="lookedUpValue"/> <store-value value-field="lookedUpValue"/> </simple-method> Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementServices.java Tue Jun 19 21:36:11 2012 @@ -1634,7 +1634,7 @@ public class ContentManagementServices { } Timestamp orderCreatedDate = (Timestamp) orderHeader.get("orderDate"); context.put("orderCreatedDate", orderCreatedDate); - List<GenericValue> orderItemList = orderHeader.getRelated("OrderItem"); + List<GenericValue> orderItemList = orderHeader.getRelated("OrderItem", null, null, false); ModelService subscriptionModel = dispatcher.getDispatchContext().getModelService("updateContentSubscriptionByProduct"); for(GenericValue orderItem : orderItemList) { BigDecimal qty = orderItem.getBigDecimal("quantity"); Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementWorker.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementWorker.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/ContentManagementWorker.java Tue Jun 19 21:36:11 2012 @@ -402,7 +402,7 @@ public class ContentManagementWorker { map.put("description", description); for(String [] publishPointArray : permittedPublishPointList) { String publishPointId = publishPointArray[0]; - List<GenericValue> contentAssocList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentId", publishPointId)); + List<GenericValue> contentAssocList = content.getRelated("ToContentAssoc", UtilMisc.toMap("contentId", publishPointId), null, false); List<GenericValue> filteredList = EntityUtil.filterByDate(contentAssocList); if (filteredList.size() > 0) { map.put(publishPointId, "Y"); @@ -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/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentKeywordIndex.java Tue Jun 19 21:36:11 2012 @@ -183,7 +183,7 @@ public class ContentKeywordIndex { int weight = 1; addWeightedDataResourceString(contentDataResourceView, weight, strings, delegator, content); - List<GenericValue> alternateViews = contentDataResourceView.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate")); + List<GenericValue> alternateViews = contentDataResourceView.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"), false); alternateViews = EntityUtil.filterByDate(alternateViews, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true); for (GenericValue thisView: alternateViews) { addWeightedDataResourceString(thisView, weight, strings, delegator, content); Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentMapFacade.java Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentServicesComplex.java Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/content/ContentWorker.java Tue Jun 19 21:36:11 2012 @@ -153,17 +153,17 @@ public class ContentWorker implements or if (partyId != null && roleTypeId != null) { List<GenericValue> alternateViews = null; try { - alternateViews = content.getRelatedCache("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_ROLE"), UtilMisc.toList("-caFromDate")); + alternateViews = content.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_ROLE"), UtilMisc.toList("-caFromDate"), true); } catch (GenericEntityException e) { Debug.logError(e, "Error finding alternate content: " + e.toString(), module); } alternateViews = EntityUtil.filterByDate(alternateViews, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true); for(GenericValue thisView : alternateViews) { - GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelatedByAndCache("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId)))); + GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelated("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId), null, true))); GenericValue altContent = null; if (UtilValidate.isNotEmpty(altContentRole)) { - altContent = altContentRole.getRelatedOneCache("Content"); + altContent = altContentRole.getRelatedOne("Content", true); if (altContent != null) { content = altContent; } @@ -375,7 +375,7 @@ public class ContentWorker implements or List<GenericValue> alternateViews = null; try { - alternateViews = view.getRelatedCache("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate")); + alternateViews = view.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"), true); } catch (GenericEntityException e) { Debug.logError(e, "Error finding alternate locale content: " + e.toString(), module); return contentAssocDataResourceViewFrom; @@ -433,19 +433,19 @@ public class ContentWorker implements or } contentId = (String) content.get("contentId"); contentTypeId = (String) content.get("contentTypeId"); - List<GenericValue> topicList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "TOPIC")); + List<GenericValue> topicList = content.getRelated("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "TOPIC"), null, false); List<String> topics = FastList.newInstance(); for (int i = 0; i < topicList.size(); i++) { GenericValue assoc = topicList.get(i); topics.add(assoc.getString("contentId")); } - List<GenericValue> keywordList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "KEYWORD")); + List<GenericValue> keywordList = content.getRelated("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "KEYWORD"), null, false); List<String> keywords = FastList.newInstance(); for (int i = 0; i < keywordList.size(); i++) { GenericValue assoc = keywordList.get(i); keywords.add(assoc.getString("contentId")); } - List<GenericValue> purposeValueList = content.getRelatedCache("ContentPurpose"); + List<GenericValue> purposeValueList = content.getRelated("ContentPurpose", null, null, true); List<String> purposes = FastList.newInstance(); for (int i = 0; i < purposeValueList.size(); i++) { GenericValue purposeValue = purposeValueList.get(i); @@ -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); } } @@ -608,7 +608,7 @@ public class ContentWorker implements or public static List<Object> getPurposes(GenericValue content) { List<Object> purposes = FastList.newInstance(); try { - List<GenericValue> purposeValueList = content.getRelatedCache("ContentPurpose"); + List<GenericValue> purposeValueList = content.getRelated("ContentPurpose", null, null, true); for (int i = 0; i < purposeValueList.size(); i++) { GenericValue purposeValue = purposeValueList.get(i); purposes.add(purposeValue.get("contentPurposeTypeId")); @@ -622,7 +622,7 @@ public class ContentWorker implements or public static List<Object> getSections(GenericValue content) { List<Object> sections = FastList.newInstance(); try { - List<GenericValue> sectionValueList = content.getRelatedCache("FromContentAssoc"); + List<GenericValue> sectionValueList = content.getRelated("FromContentAssoc", null, null, true); for (int i = 0; i < sectionValueList.size(); i++) { GenericValue sectionValue = sectionValueList.get(i); String contentAssocPredicateId = (String)sectionValue.get("contentAssocPredicateId"); @@ -639,7 +639,7 @@ public class ContentWorker implements or public static List<Object> getTopics(GenericValue content) { List<Object> topics = FastList.newInstance(); try { - List<GenericValue> topicValueList = content.getRelatedCache("FromContentAssoc"); + List<GenericValue> topicValueList = content.getRelated("FromContentAssoc", null, null, true); for (int i = 0; i < topicValueList.size(); i++) { GenericValue topicValue = topicValueList.get(i); String contentAssocPredicateId = (String)topicValue.get("contentAssocPredicateId"); Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/ContentDocument.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/ContentDocument.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/ContentDocument.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/search/ContentDocument.java Tue Jun 19 21:36:11 2012 @@ -169,7 +169,7 @@ public class ContentDocument { } List<GenericValue> featureDataResourceList; try { - featureDataResourceList = content.getRelatedCache("ProductFeatureDataResource"); + featureDataResourceList = content.getRelated("ProductFeatureDataResource", null, null, true); } catch (GenericEntityException e) { Debug.logError(e, module); List<String> badIndexList = UtilGenerics.checkList(context.get("badIndexList")); Modified: ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/template/survey/genericsurvey.ftl Tue Jun 19 21:36:11 2012 @@ -68,12 +68,12 @@ 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"/> <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "OPTION"/> - <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", sequenceSort)?if_exists/> + <#assign options = surveyQuestionAndAppl.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists/> <#assign selectedOption = (answer.surveyOptionSeqId)?default("_NA_")/> <select name="${questionFieldName}"> <#if surveyQuestionAndAppl.requiredField?default("N") != "Y"> @@ -90,7 +90,7 @@ under the License. <#elseif surveyQuestionAndAppl.surveyQuestionTypeId == "ENUMERATION"/> <select name="${questionFieldName}"> <#assign formatString = surveyQuestionAndAppl.get("formatString")?if_exists/> - <#assign enums = surveyQuestionAndAppl.getRelated("Enumeration")/> + <#assign enums = surveyQuestionAndAppl.getRelated("Enumeration", null, null, false)/> <#list enums as enum> <#if (((answer.textResponse)?has_content && answer.textResponse == enum.enumId) || (defValue == enum.enumId))> <#assign selected = 'selected'/> @@ -176,9 +176,9 @@ 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"))/> + <#assign surveyMultiRespColumnList = surveyMultiResp.getRelated("SurveyMultiRespColumn", null, Static["org.ofbiz.base.util.UtilMisc"].toList("sequenceNum"), true)/> <#if lastSurveyMultiRespId == ""> <#assign openMultiRespHeader = true/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/layout/EditSubContent.groovy Tue Jun 19 21:36:11 2012 @@ -18,13 +18,13 @@ */ import org.ofbiz.base.util.* +import org.ofbiz.base.util.template.FreeMarkerWorker import org.ofbiz.entity.* import org.ofbiz.entity.model.* import org.ofbiz.content.data.DataResourceWorker import org.ofbiz.webapp.ftl.FreeMarkerViewHandler import java.io.StringWriter -import freemarker.ext.beans.BeansWrapper import freemarker.template.WrappingTemplateModel import javax.servlet.* @@ -37,7 +37,7 @@ if (currentValue) { if (dataResourceTypeId) { mimeTypeId = currentValue.drMimeTypeId; rootDir = request.getSession().getServletContext().getRealPath("/"); - wrapper = BeansWrapper.getDefaultInstance(); + wrapper = FreeMarkerWorker.getDefaultOfbizWrapper(); WrappingTemplateModel.setDefaultObjectWrapper(wrapper); templateRoot = [:]; FreeMarkerViewHandler.prepOfbizRoot(templateRoot, request, response); Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.groovy Tue Jun 19 21:36:11 2012 @@ -65,7 +65,7 @@ categoryQuestions = null; if (surveyQuestionCategoryId) { surveyQuestionCategory = delegator.findOne("SurveyQuestionCategory", [surveyQuestionCategoryId : surveyQuestionCategoryId], false); if (surveyQuestionCategory) { - categoryQuestions = surveyQuestionCategory.getRelated("SurveyQuestion"); + categoryQuestions = surveyQuestionCategory.getRelated("SurveyQuestion", null, null, false); } } questionCategories = delegator.findList("SurveyQuestionCategory", null, null, ['description'], null, false); Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/EditWebSiteParties.groovy Tue Jun 19 21:36:11 2012 @@ -19,13 +19,13 @@ webSiteRoleDatas = [] as LinkedList; if (webSite) { - webSiteRoles = webSite.getRelated("WebSiteRole", null, ['sequenceNum', 'partyId']); + webSiteRoles = webSite.getRelated("WebSiteRole", null, ['sequenceNum', 'partyId'], false); 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/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSiteCMSMetaInfo.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/WEB-INF/actions/website/WebSitePublishPoint.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/content/webapp/content/content/nav.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/content/nav.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/content/nav.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/content/nav.ftl Tue Jun 19 21:36:11 2012 @@ -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")?if_exists/> + <#assign assocs = assoc.getRelated("ChildDataCategory", null, null, false)?if_exists/> <#if assocChilds?has_content> ,"children": [ <@fillTree assocList = assocChilds/> @@ -87,4 +87,4 @@ var rawdata = [ </script> -<div id="tree"></div> \ No newline at end of file +<div id="tree"></div> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyQuestions.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyQuestions.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyQuestions.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/EditSurveyQuestions.ftl Tue Jun 19 21:36:11 2012 @@ -44,12 +44,12 @@ 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")/> + <#assign currentSurveyMultiRespColumns = currentSurveyMultiResp.getRelated("SurveyMultiRespColumn", null, null, false)/> <#else/> <#assign currentSurveyMultiRespColumns = []/> </#if> @@ -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="<@ofbizUrl>createSurveyQuestionAppl</@ofbizUrl>"> <input type="hidden" name="surveyId" value="${requestParameters.surveyId}" /> <input type="hidden" name="surveyQuestionId" value="${question.surveyQuestionId}" /> @@ -284,8 +284,15 @@ under the License. <tr<#if alt_row> class="alternate-row"</#if>> <td>${option.description?if_exists}</td> <td>${option.sequenceNum?if_exists}</td> - <td><a href="<@ofbizUrl>EditSurveyQuestions?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a> - <td><a href="<@ofbizUrl>removeSurveyQuestionAppl?surveyId=${requestParameters.surveyId}&surveyQuestionId=${option.surveyQuestionId}&surveyOptionSeqId=${option.surveyOptionSeqId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a> + <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"> + <input type="hidden" name="surveyId" value="${requestParameters.surveyId}" /> + <input type="hidden" name="surveyQuestionId" value="${option.surveyQuestionId}" /> + <input type="hidden" name="surveyOptionSeqId" value="${option.surveyOptionSeqId}" /> + <a href="javascript:document.getElementById('deleteSurveyQuestionOption_${option_index}').submit();"" class="buttontext">${uiLabelMap.CommonRemove}</a> + </form> + </td> </tr> <#assign alt_row = !alt_row> </#list> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/ViewSurveyResponses.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/ViewSurveyResponses.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/ViewSurveyResponses.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/survey/ViewSurveyResponses.ftl Tue Jun 19 21:36:11 2012 @@ -57,7 +57,7 @@ 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", sequenceSort)?if_exists> + <#assign options = question.getRelated("SurveyQuestionOption", null, sequenceSort, false)?if_exists> <#if options?has_content> <#list options as option> <#assign optionResults = results.get(option.surveyOptionSeqId)?if_exists> @@ -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="<@ofbizUrl>img?imgId=${content.dataResourceId}</@ofbizUrl>" class="buttontext">${answer.contentId}</a> - ${content.contentName?if_exists} </#if> </#if> @@ -117,4 +117,4 @@ under the License. <td class="label">${uiLabelMap.ContentSurveyNoQuestions}</div></td> </tr> </#if> - </table> \ No newline at end of file + </table> Modified: ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSContent.ftl Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSNav.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/webapp/content/website/WebSiteCMSNav.ftl Tue Jun 19 21:36:11 2012 @@ -49,11 +49,11 @@ <#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}'), '');"}}, - <#assign assocChilds = content.getRelated("FromContentAssoc")?if_exists/> + <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)?if_exists/> "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}", "contentAssocTypeId" : "${assoc.contentAssocTypeId}"} <#if assocChilds?has_content> ,"children": [ @@ -71,10 +71,10 @@ <#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/> + <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)?if_exists/> "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"} <#if assocChilds?has_content> ,"children": [ @@ -93,10 +93,10 @@ <#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/> + <#assign assocChilds = content.getRelated("FromContentAssoc", null, null, false)?if_exists/> "attr": {"id" : "${assoc.contentIdTo}", "contentId" : "${assoc.contentId}", "fromDate" : "${assoc.fromDate}"} <#if assocChilds?has_content> ,"children": [ Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/cms/CMSForms.xml Tue Jun 19 21:36:11 2012 @@ -44,7 +44,7 @@ under the License. </service> </actions> - <field name="caContentIdTo" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="caContentIdTo" title=" "> <hyperlink also-hidden="false" description="${caContentIdTo}" target="EditAddContent"> <parameter param-name="MASTER_contentId" from-field="contentId"/> <parameter param-name="MASTER_drDataResourceId" from-field="drDataResourceId"/> @@ -132,7 +132,7 @@ under the License. <field name="newTopicDescription" title="Description" position="3"> <text size="24"/> </field> - <field name="createTopic" title="${uiLabelMap.CommonEmptyHeader}" position="4"> + <field name="createTopic" title=" " position="4"> <hyperlink also-hidden="false" target="createTopic${pageName}" description="Create Topic"> <parameter param-name="mode" value="restore"/> </hyperlink> @@ -295,7 +295,7 @@ under the License. <hidden value="${dataResourceTypeId}"/> </field> <!-- - <field name="submitContentEdit" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="submitContentEdit" title=" "> <hyperlink also-hidden="false" description="Submit" target="javascript:document.EditAddContent.action='${persistAction}'; document.EditAddContent.submit()" target-type="plain"/> </field> --> @@ -393,7 +393,7 @@ under the License. </form> <form name="AdminIndexAll" target="indexTree" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> - <field name="contentId" title="${uiLabelMap.CommonEmptyHeader}" position="1"><text size="50" default-value="WebStoreCONTENT"/></field> + <field name="contentId" title=" " position="1"><text size="50" default-value="WebStoreCONTENT"/></field> <field name="submitButton" title="${uiLabelMap.ContentIndexAll}" widget-style="smallSubmit" position="2"><submit button-type="button"/></field> </form> @@ -403,7 +403,7 @@ under the License. </form> <form name="searchList" type="list" target="" list-name="queryResults" paginate-target="/AdminSearch" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> - <field name="editContent" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="editContent" title=" "> <hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="CMSContentEdit"> <parameter param-name="contentId"/> <parameter param-name="drDataResourceId" from-field="dataResourceId"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/content/DataResourceForms.xml Tue Jun 19 21:36:11 2012 @@ -358,7 +358,7 @@ under the License. <form name="AddDataResourceAttribute" target="addDataResourceAttribute" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createDataResourceAttribute"/> - <field name="dataResourceId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="tabletext" map-name="currentValue"><display/></field> + <field name="dataResourceId" title=" " map-name="currentValue"><display/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListDataResourceAttribute" list-name="dataResourceAttribute" target="updateDataResourceAttribute" title="" type="list" @@ -386,8 +386,8 @@ under the License. <form name="AddDataResourceRole" target="addDataResourceRole" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="DataResourceRole"/> - <field name="dataResourceId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="tabletext" map-name="currentValue"><display/></field> - <field name="partyId" title="${uiLabelMap.CommonEmptyHeader}" widget-style="tabletext"><lookup target-form-name="LookupPerson"/></field> + <field name="dataResourceId" title=" " map-name="currentValue"><display/></field> + <field name="partyId" title=" "><lookup target-form-name="LookupPerson"/></field> <field name="roleTypeId"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/> Modified: ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/content/widget/datasetup/DataSetupForms.xml Tue Jun 19 21:36:11 2012 @@ -151,7 +151,7 @@ under the License. <form name="AddFileExtension" target="addFileExtension" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createFileExtension"/> - <field name="mimeTypeId" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="mimeTypeId" title=" "> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/> @@ -170,7 +170,7 @@ under the License. <field name="fileExtensionId" widget-style="tabletext"> <display/> </field> - <field name="mimeTypeId" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="mimeTypeId" title=" "> <drop-down allow-empty="false"> <entity-options description="${description}" entity-name="MimeType" key-field-name="mimeTypeId"/> Modified: ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResEntityLabels.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResEntityLabels.xml (original) +++ ofbiz/branches/20120329_portletWidget/applications/humanres/config/HumanResEntityLabels.xml Tue Jun 19 21:36:11 2012 @@ -23,25 +23,31 @@ <property key="EmplLeaveReasonType.description.CASUAL"> <value xml:lang="en">Casual</value> <value xml:lang="fr">Convenance</value> + <value xml:lang="vi">Tình cá»</value> </property> <property key="EmplLeaveReasonType.description.MEDICAL"> <value xml:lang="en">Medical</value> <value xml:lang="fr">Maladie</value> + <value xml:lang="vi">Y tế</value> </property> <property key="EmplLeaveType.description.INLAND_EARNED"> <value xml:lang="en">Inland earned</value> <value xml:lang="fr">Congé payé</value> + <value xml:lang="vi">Thu nháºp quá»c ná»i</value> </property> <property key="EmplLeaveType.description.LOSS_OF_PAY"> <value xml:lang="en">Loss of pay</value> <value xml:lang="fr">Sans solde</value> + <value xml:lang="vi">Mất thanh toán</value> </property> <property key="EmplLeaveType.description.RESTRICTED_HOLIDAY"> <value xml:lang="en">Restricted holiday</value> <value xml:lang="fr">Jour férié</value> + <value xml:lang="vi">Kỳ nghá» hạn chế</value> </property> <property key="EmplLeaveType.description.SPECIAL_DAY_OFF"> <value xml:lang="en">Special day off</value> <value xml:lang="fr">Congé</value> + <value xml:lang="vi">Ngà y nghá» Äặc biá»t</value> </property> </resource> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |