svn commit: r1682118 - in /ofbiz/trunk: applications/accounting/widget
Locked
svn commit: r1682118 - in /ofbiz/trunk: applications/accounting/widget
 
|
Author: jleroux
Date: Wed May 27 20:39:43 2015 New Revision: 1682118 URL: http://svn.apache.org/r1682118 Log: This closes "Replace bsh code with Groovy code" https://issues.apache.org/jira/browse/OFBIZ-6332 with all its subtasks and more. jleroux: I suspected it was only a matter of replacing "${bsh" by "${groovy" in *.xml. But I had not the guts to get into 11(!) sub tasks. So, in Eclipse, I simply did a S/R in *.xml and compared parts of my changes with some Pierre's most "complex" patches respectively product, ebaystore, projectmgr and scrum. They were totally similar (just revisions number changed) so here is the whole. I will later improve these changes by removing HTML entities when possible, this is a bit more delicate because in some cases the XML schema are not complete (or/and for other still obscure to me reasons) and if you simply replace HTML entities by simple code (eg &Amp; by &) you get issues in logs when the XML parser cross them... Note: only menus, screen and forms are changed here. Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/content/widget/forum/ForumForms.xml ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/framework/webtools/widget/tempExprForms.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectMenus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml ofbiz/trunk/specialpurpose/scrum/widget/MyWorkScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Wed May 27 20:39:43 2015 @@ -136,7 +136,7 @@ under the License. <field name="shipmentId" use-when="shipmentId==null"><display/></field> <field name="isPosted"><display/></field> <field name="postedDate"><display/></field> - <field name="postAcctgTrans" title=" " use-when=""N".equals(isPosted)" widget-style="buttontext"> + <field name="postAcctgTrans" title=" " use-when="'N'.equals(isPosted)" widget-style="buttontext"> <hyperlink target="postAcctgTrans" description="${uiLabelMap.AccountingPostTransaction}"> <parameter param-name="acctgTransId"/> </hyperlink> @@ -146,7 +146,7 @@ under the License. <parameter param-name="acctgTransId"/> </hyperlink> </field> - <field name="postAcctgTrans" title=" " use-when="!"N".equals(isPosted)"><display/></field> + <field name="postAcctgTrans" title=" " use-when="!'N'.equals(isPosted)"><display/></field> </form> <form name="ListUnpostedAcctgTrans" type="list" title="Unposted Accounting Transactions" list-name="transactions" @@ -277,7 +277,7 @@ under the License. </entity-condition> </actions> <row-actions> - <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get("glAccountId");return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> + <set field="showPosition1" value="${groovy:String prev=(String)previousItem.get('glAccountId');return new Boolean(!(prev!=null&&prev.equals(glAccountId)));}" type="Boolean"/> </row-actions> <field name="accountCode" position="1" use-when="showPosition1"><display/></field> <field name="glAccountDescription" title="${uiLabelMap.CommonDescription}" position="1" use-when="showPosition1"> @@ -862,7 +862,7 @@ under the License. <field name="reconciledDate"><date-time/></field> <field name="organizationPartyId"><display/></field> <field name="reconciledBalance"><display/></field> - <field name="openingBalance" use-when=""GLREC_RECONCILED".equals("${glReconciliation.statusId}")"><display/></field> + <field name="openingBalance" use-when="'GLREC_RECONCILED'.equals('${glReconciliation.statusId}')"><display/></field> <field use-when="glReconciliationId!=null" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field> </form> <form name="ListGlReconciliationEntries" type="list" use-row-submit="true" Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Wed May 27 20:39:43 2015 @@ -290,7 +290,7 @@ under the License. </field> <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> <field name="mapKey"><display/></field> - <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field> + <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc"> <parameter param-name="contentId"/> @@ -321,7 +321,7 @@ under the License. <field name="contentIdTo"><hidden/></field> <field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field> <field name="mapKey"><display/></field> - <field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field> + <field name="fromDate"><display description="${groovy:fromDate.toString().substring(0,10)}"/></field> <field name="deleteLink" title=" " widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="removeContentAssoc"> <parameter param-name="contentId"/> Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Wed May 27 20:39:43 2015 @@ -65,7 +65,7 @@ under the License. <parameter param-name="deactivateExisting" value="yes"/> </hyperlink> </field> - <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate.toString().substring(0,10)}"/></field> + <field name="fromDate" entry-name="caFromDate"><display description="${groovy:caFromDate.toString().substring(0,10)}"/></field> <field name="nbrOfMessages" entry-name="childBranchCount"><display/></field> </form> <form name="AddForum" type="single" target="createForum" @@ -150,8 +150,8 @@ under the License. <field name="dataResourceTypeId"><hidden value="ELECTRONIC_TEXT"/></field> <field name="messageTitle" entry-name="description" parameter-name="description"><display/></field> <field name="createdBy" entry-name="createdByUserLogin"><display/></field> - <field name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field> - <field name="thruDate" entry-name="caThruDate"><display description="${bsh:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field> + <field name="fromDate" entry-name="caFromDate"><display description="${groovy:caFromDate!=null?caFromDate.toString().substring(0,10):""}"/></field> + <field name="thruDate" entry-name="caThruDate"><display description="${groovy:caThruDate!=null?caThruDate.toString().substring(0,10):""}"/></field> <field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage"> <parameter param-name="forumGroupId"/> <parameter param-name="forumId"/> Modified: ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml (original) +++ ofbiz/trunk/applications/humanres/widget/PersonTrainingScreens.xml Wed May 27 20:39:43 2015 @@ -36,7 +36,7 @@ <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Days.groovy"/> </actions> <widgets> - <screenlet title="${uiLabelMap.WorkEffortDayView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"> + <screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day"> <include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/> <include-screen name="trainingCalendarDetail"/> <platform-specific> @@ -56,7 +56,7 @@ <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Week.groovy"/> </actions> <widgets> - <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week"> + <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week"> <include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/> <include-screen name="trainingCalendarDetail"/> <platform-specific> @@ -73,7 +73,7 @@ <script location="component://workeffort/webapp/workeffort/WEB-INF/actions/calendar/Month.groovy"/> </actions> <widgets> - <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"> + <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month"> <include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/> <include-screen name="trainingCalendarDetail"/> <platform-specific> Modified: ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/GlobalHRSettingForms.xml Wed May 27 20:39:43 2015 @@ -135,7 +135,7 @@ under the License. <form name="ListEmplPositionTypeRates" type="list" title="" target="deleteEmplPositionTypeRate" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="EmplPositionTypeRateAndAmount" filter-by-date="true"> <condition-list combine="and"> <condition-expr field-name="emplPositionTypeId" from-field="parameters.emplPositionTypeId" operator="equals"/> Modified: ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/RecruitmentForms.xml Wed May 27 20:39:43 2015 @@ -447,7 +447,7 @@ under the License. <field name="internalOrganisation"><display/></field> <field name="reportingDate"><display/></field> <field name="location"> - <display description="${bsh: + <display description="${groovy: import org.ofbiz.entity.GenericValue; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.util.EntityUtil; Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Wed May 27 20:39:43 2015 @@ -124,7 +124,7 @@ under the License. </form> <form name="EditEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent" id="EditEmail"> <actions> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <entity-condition entity-name="PartyContactWithPurpose" list="emailAddresses"> <condition-list combine="and"> <condition-expr field-name="partyId" from-field="partyIdFrom"/> @@ -184,7 +184,7 @@ under the License. </form> <form name="EditInternalNote" type="single" target="createCommunicationEvent" default-map-name="communicationEvent"> <actions> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/recentVisitor.groovy"/> </actions> <alt-target use-when="communicationEvent!=null" target="updateCommunicationEvent"/> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Wed May 27 20:39:43 2015 @@ -908,9 +908,9 @@ under the License. <set field="actualCurrencyUomId" from-field="actualCurrencyUomId" default-value="${defaultOrganizationPartyCurrencyUomId}"/> </actions> <row-actions> - <set field="total" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator, invoiceId, actualCurrency)}"/> - <set field="amountToApply" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId, actualCurrency)}"/> - <set field="amountApplied" value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(delegator,invoiceId, org.ofbiz.base.util.UtilDateTime.nowTimestamp(), actualCurrency)}"/> + <set field="total" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator, invoiceId, actualCurrency)}"/> + <set field="amountToApply" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId, actualCurrency)}"/> + <set field="amountApplied" value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(delegator,invoiceId, org.ofbiz.base.util.UtilDateTime.nowTimestamp(), actualCurrency)}"/> </row-actions> <field name="invoiceId"> <display-entity entity-name="Invoice" description=" " also-hidden="true"> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigForms.xml Wed May 27 20:39:43 2015 @@ -32,7 +32,7 @@ under the License. </service> </actions> <row-actions> - <set field="typeDescription" value="${bsh: return "SINGLE".equals(configItemTypeId) ? uiLabelMap.get("ProductSingleChoice") : uiLabelMap.get("ProductMultiChoice")}"/> + <set field="typeDescription" value="${groovy: return "SINGLE".equals(configItemTypeId) ? uiLabelMap.get("ProductSingleChoice") : uiLabelMap.get("ProductMultiChoice")}"/> </row-actions> <field name="configItemId" title="${uiLabelMap.ProductConfigItem}" widget-style="buttontext"> <hyperlink target="EditProductConfigItem" description="${configItemId}"> Modified: ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ImageManagementForms.xml Wed May 27 20:39:43 2015 @@ -95,10 +95,10 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> - <field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="statusProductId" title="${uiLabelMap.ProductStatus}" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <radio no-current-selected-key="${checkRadio}"> <option key="IM_APPROVED__${productId}" description="${uiLabelMap.FormFieldTitle_approve}"/> <option key="IM_REJECTED__${productId}" description="${uiLabelMap.FormFieldTitle_rejectButton}"/> @@ -150,7 +150,7 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> @@ -189,7 +189,7 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="_rowSubmit" position="2" title=" " widget-style="hidden"><check all-checked="true"/></field> @@ -244,7 +244,7 @@ under the License. <field-map field-name="productCategoryId" from-field="product.primaryProductCategoryId"/> </entity-one> </row-actions> - <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${bsh:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> + <field name="productId" title="${uiLabelMap.ProductProductName} [${uiLabelMap.ProductProductId}] - ${uiLabelMap.FormFieldTitle_categoryName}" entry-name="productId" position="1" use-when="${groovy:String prev=(String)previousItem.get("productId");return new Boolean(!(prev!=null&&prev.equals(productId)));}"> <display-entity entity-name="Product" key-field-name="productId" description="${internalName} [${productId}] - ${productCategory.categoryName}" also-hidden="false"/> </field> <field name="drObjectInfo" position="2" title="${uiLabelMap.CommonImage}"><image style="cssImgLarge"/></field> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductForms.xml Wed May 27 20:39:43 2015 @@ -2039,7 +2039,7 @@ under the License. <display-entity entity-name="GlAccountType" key-field-name="glAccountTypeId" description="${description}"/> </field> <field name="organizationPartyId" title="${uiLabelMap.ProductOrganization}"> - <display description="${bsh: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/> + <display description="${groovy: org.ofbiz.party.party.PartyHelper.getPartyName(delegator, organizationPartyId, true);} [${organizationPartyId}]"/> </field> <field name="glAccountId" title="${uiLabelMap.ProductGlAccount}"> <drop-down allow-empty="false"> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductStoreForms.xml Wed May 27 20:39:43 2015 @@ -1074,24 +1074,24 @@ </field> <field name="paymentPropertiesPath" title="${uiLabelMap.ProductPaymentProps}"><display/></field> <field name="applyToAllProducts" title="${uiLabelMap.ProductApplyToAll}"><display/></field> - <field name="editLink" title=" " use-when="${bsh:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext"> + <field name="editLink" title=" " use-when="${groovy:security.hasEntityPermission("CATALOG", "_UPDATE", session);}" widget-style="buttontext"> <hyperlink target="EditProductStorePaySetup" description="${uiLabelMap.CommonEdit}" also-hidden="false"> <parameter param-name="productStoreId"/> <parameter param-name="paymentMethodTypeId"/> <parameter param-name="paymentServiceTypeEnumId"/> </hyperlink> </field> - <field name="editLink" title=" " use-when="${bsh:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}"> + <field name="editLink" title=" " use-when="${groovy:!security.hasEntityPermission("CATALOG", "_UPDATE", session);}"> <display/> </field> - <field name="deleteLink" title=" " use-when="${bsh:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext"> + <field name="deleteLink" title=" " use-when="${groovy:security.hasEntityPermission("CATALOG", "_DELETE", session);}" widget-style="buttontext"> <hyperlink target="storeRemovePaySetting" description="${uiLabelMap.CommonDelete}" also-hidden="false"> <parameter param-name="productStoreId"/> <parameter param-name="paymentMethodTypeId"/> <parameter param-name="paymentServiceTypeEnumId"/> </hyperlink> </field> - <field name="deleteLink" title=" " use-when="${bsh:!security.hasEntityPermission("CATALOG", "_DELETE", session);}"> + <field name="deleteLink" title=" " use-when="${groovy:!security.hasEntityPermission("CATALOG", "_DELETE", session);}"> <display/> </field> </form> Modified: ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/CalendarScreens.xml Wed May 27 20:39:43 2015 @@ -50,7 +50,7 @@ under the License. <widgets> <include-screen name="eventDetail"/> <container style="bothclear"> - <screenlet title="${uiLabelMap.WorkEffortDayView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day" padded="false"> + <screenlet title="${uiLabelMap.WorkEffortDayView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "EEEE MMMM d, yyyy", timeZone, locale)}" navigation-menu-name="Day" padded="false"> <include-menu name="Day" location="component://workeffort/widget/WorkEffortMenus.xml"/> <platform-specific> <html><html-template location="component://workeffort/webapp/workeffort/calendar/day.ftl"/></html> @@ -72,7 +72,7 @@ under the License. <widgets> <include-screen name="eventDetail"/> <container style="bothclear"> - <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week" padded="false"> + <screenlet title="${uiLabelMap.WorkEffortWeekView}: ${uiLabelMap.CommonWeek} ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "w", timeZone, locale)}" navigation-menu-name="Week" padded="false"> <include-menu name="Week" location="component://workeffort/widget/WorkEffortMenus.xml"/> <platform-specific> <html><html-template location="component://workeffort/webapp/workeffort/calendar/week.ftl"/></html> @@ -91,7 +91,7 @@ under the License. <widgets> <include-screen name="eventDetail"/> <container style="bothclear"> - <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${bsh:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month" padded="false"> + <screenlet title="${uiLabelMap.WorkEffortMonthView}: ${groovy:org.ofbiz.base.util.UtilDateTime.timeStampToString(start, "MMMM yyyy", timeZone, locale)}" navigation-menu-name="Month" padded="false"> <include-menu name="Month" location="component://workeffort/widget/WorkEffortMenus.xml"/> <platform-specific> <html><html-template location="component://workeffort/webapp/workeffort/calendar/month.ftl"/></html> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Wed May 27 20:39:43 2015 @@ -924,7 +924,7 @@ under the License. </hyperlink> </field> <field name="noteInfo" title="${uiLabelMap.CommonNote}"><display/></field> - <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> + <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${noteDateTime}"/></field> <field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when=""N".equals(internalNote)"> <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPrivate}"> <parameter param-name="workEffortId"/> @@ -1352,7 +1352,7 @@ under the License. <form name="EditICalendar" default-map-name="workEffort" target="updateICalendar" type="single"> <actions> - <set field="serverRootUrl" value="${bsh: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/> + <set field="serverRootUrl" value="${groovy: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/> </actions> <alt-target target="createICalendar" use-when="workEffort==null"/> <field name="workEffortTypeId"><hidden value="PUBLISH_PROPS"></hidden></field> @@ -1427,7 +1427,7 @@ under the License. <field-map field-name="partyId" from-field="userLogin.partyId"/> <field-map field-name="statusId" value="PRTYASGN_ASSIGNED"/> </entity-and> - <set field="serverRootUrl" value="${bsh: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/> + <set field="serverRootUrl" value="${groovy: org.ofbiz.base.util.UtilHttp.getServerRootUrl(request)}"/> </actions> <field name="workEffortId" title="${uiLabelMap.WorkEffortWorkEffortId}"> <hyperlink also-hidden="false" description="${workEffortId}" target="EditICalendar" target-type="plain"> Modified: ofbiz/trunk/framework/webtools/widget/tempExprForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/widget/tempExprForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/widget/tempExprForms.xml (original) +++ ofbiz/trunk/framework/webtools/widget/tempExprForms.xml Wed May 27 20:39:43 2015 @@ -24,7 +24,7 @@ under the License. <!-- Temporal Expression forms --> <form name="FindTemporalExpression" target="findTemporalExpression" type="single"> <actions> - <set field="expressionTypeList" value="${bsh:org.ofbiz.service.calendar.ExpressionUiHelper.getExpressionTypeList(uiLabelMap);}" type="List"/> + <set field="expressionTypeList" value="${groovy:org.ofbiz.service.calendar.ExpressionUiHelper.getExpressionTypeList(uiLabelMap);}" type="List"/> </actions> <field name="tempExprId" title="${uiLabelMap.TemporalExpressionId}"><text-find/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayForms.xml Wed May 27 20:39:43 2015 @@ -36,8 +36,8 @@ under the License. <form name="ListOrdersFromEbay" type="multi" use-row-submit="true" list-name="orderList" target="ImportOrderFromEbay" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <set field="canImportOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/> - <set field="allowProductIdChange" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isNotEmpty(errorMessage)}" type="Boolean"/> + <set field="canImportOrder" value="${groovy: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isEmpty(errorMessage)}" type="Boolean"/> + <set field="allowProductIdChange" value="${groovy: org.ofbiz.base.util.UtilValidate.isEmpty(orderId) && org.ofbiz.base.util.UtilValidate.isNotEmpty(errorMessage)}" type="Boolean"/> </row-actions> <field name="productStoreId"><hidden/></field> <field name="externalId" title="${uiLabelMap.EbayImportEbayItem}"><display/></field> @@ -105,9 +105,9 @@ under the License. <form name="ListEbayOrders" type="multi" use-row-submit="true" list-name="orderList" target="importEbayOrders" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <row-actions> - <set field="canImportOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isEmpty(orderId)}" type="Boolean"/> - <set field="isEbayOrder" value="${bsh: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayOrder)}" type="Boolean"/> - <set field="isEbayTransaction" value="${bsh: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayTransaction)}" type="Boolean"/> + <set field="canImportOrder" value="${groovy: org.ofbiz.base.util.UtilValidate.isEmpty(orderId)}" type="Boolean"/> + <set field="isEbayOrder" value="${groovy: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayOrder)}" type="Boolean"/> + <set field="isEbayTransaction" value="${groovy: org.ofbiz.base.util.UtilValidate.isNotEmpty(isEbayTransaction)}" type="Boolean"/> </row-actions> <field name="productStoreId"><hidden/></field> <field name="externalId" title="${uiLabelMap.EbayEbayOrderIdOrTransactionId}" use-when="${isEbayOrder}" tooltip="eBay Order"><display/></field> Modified: ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml (original) +++ ofbiz/trunk/specialpurpose/ebaystore/widget/EbaySellingManagerForms.xml Wed May 27 20:39:43 2015 @@ -526,7 +526,7 @@ under the License. <field-map field-name="productStoreId" from-field="parameters.productStoreId"/> <field-map field-name="roleTypeId" value="EBAY_ACCOUNT"/> </entity-and> - <set field="partyId" value="${bsh: + <set field="partyId" value="${groovy: import org.ofbiz.entity.util.EntityUtil; GenericValue partyStore = EntityUtil.getFirst(storeList); if(partyStore!=null) partyId = partyStore.getString("partyId"); @@ -760,18 +760,18 @@ under the License. <script location="component://ebaystore/webapp/ebaystore/WEB-INF/actions/store/OrderListParameters.groovy"/> </row-actions> <field name="productStoreId"><hidden value="${productStoreId}"/></field> - <field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><check/></field> - <field name="orderId" position="1" title="Order ID" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"> + <field name="_rowSubmit" position="1" title="${uiLabelMap.CommonSelect}" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><check/></field> + <field name="orderId" position="1" title="Order ID" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"> <hyperlink target="https://localhost:8443/ordermgr/control/orderview?orderId=${orderId}" description="${orderId}" target-type="plain" target-window="_BLANK"/> </field> - <field name="externalId" title="External ID" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${externalId}"></display></field> - <field name="ebayUserIdBuyer" title="Winning Bidder" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${ebayUserIdBuyer}"></display></field> + <field name="externalId" title="External ID" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${externalId}"></display></field> + <field name="ebayUserIdBuyer" title="Winning Bidder" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${ebayUserIdBuyer}"></display></field> <field name="dummy4" title=" " position="1"><display></display></field> <field name="dummy5" title=" " position="1"><display></display></field> - <field name="createdDate" title="Invoice Date" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${createdDate}"></display></field> - <field name="paymentMethodUsed" title="Payment Type" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${paymentMethodUsed}"></display></field> + <field name="createdDate" title="Invoice Date" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${createdDate}"></display></field> + <field name="paymentMethodUsed" title="Payment Type" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${paymentMethodUsed}"></display></field> <field name="dummy7" title=" " position="1"><display></display></field> - <field name="amountPaid" title="Order Total Price" position="1" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${amountPaid}"></display></field> + <field name="amountPaid" title="Order Total Price" position="1" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><display description="${amountPaid}"></display></field> <field name="dummy1" title=" " position="2"><display></display></field> <field name="dummy2" title=" " position="2"><display></display></field> @@ -785,9 +785,9 @@ under the License. <field name="quantity" title="Quantity" position="2"><display description="${quantity}"></display></field> <field name="amount" title="Amount price per item" position="2"><display description="${transactionPrice}"></display></field> - <field name="paidTime" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${paidTime}"></hidden></field> - <field name="shippedTime" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${shippedTime}"></hidden></field> - <field name="emailBuyer" use-when="${bsh:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${emailBuyer}"></hidden></field> + <field name="paidTime" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${paidTime}"></hidden></field> + <field name="shippedTime" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${shippedTime}"></hidden></field> + <field name="emailBuyer" use-when="${groovy:String prev=(String)previousItem.get("externalId");return new Boolean(!(prev!=null&&prev.equals(externalId)));}"><hidden value="${emailBuyer}"></hidden></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectMenus.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectMenus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectMenus.xml Wed May 27 20:39:43 2015 @@ -60,14 +60,14 @@ <menu name="ProjectTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <actions> <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> - <set field="hasUpdatePermission" value="${bsh: + <set field="hasUpdatePermission" value="${groovy: result = dispatcher.runSync("projectMgrPermission", org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"), "resourceDescription", "Project", "mainAction", "UPDATE", "projectId", projectId)); return result.get("hasPermission"); }" type="Boolean"/> - <set field="hasViewPermission" value="${bsh: + <set field="hasViewPermission" value="${groovy: result = dispatcher.runSync("projectMgrPermission", org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"), "resourceDescription", "Project", @@ -226,7 +226,7 @@ <menu name="ProjectButtonBar" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <actions> <set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/> - <set field="hasUpdatePermission" value="${bsh: + <set field="hasUpdatePermission" value="${groovy: result = dispatcher.runSync("projectMgrPermission", org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"), "resourceDescription", "Project", Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed May 27 20:39:43 2015 @@ -58,7 +58,7 @@ under the License. </condition> <actions> <set field="parameters.partyId" from-field="parameters.userLogin.partyId"/> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <set field="filterByDate" from-field="nowDate"/> </actions> <widgets/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TaskScreens.xml Wed May 27 20:39:43 2015 @@ -273,7 +273,7 @@ under the License. <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/> <set field="workEffortId" from-field="parameters.workEffortId"/> <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> <service service-name="getProjectIdAndNameFromTask" result-map="result"> <field-map field-name="taskId" from-field="parameters.workEffortId"/> </service> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Wed May 27 20:39:43 2015 @@ -57,7 +57,7 @@ under the License. <widgets> <decorator-screen name="CommonTimesheetDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}"> + <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}"> <section> <condition> <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> @@ -212,13 +212,13 @@ under the License. <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> </condition> <widgets> - <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}" + <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}" navigation-form-name="WeekTimesheet"> <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> </screenlet> </widgets> <fail-widgets> - <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}" + <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.ProjectMgrWeek}: ${weekNumber} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}" navigation-menu-name="TimesheetBar"> <include-menu name="TimesheetBar" location="component://projectmgr/widget/ProjectMenus.xml"/> <include-form name="EditWeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed May 27 20:39:43 2015 @@ -206,7 +206,7 @@ <field name="actualCompletionDate" title="${uiLabelMap.FormFieldTitle_actualCompletionDate}"><display type="date"/></field> <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlannedHours}"><display/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> - <field name="actualNonBilledTotalHours" title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display description="${bsh:isBillable&&actualNonBilledTotalHours!=void?actualNonBilledTotalHours:""}"/></field> + <field name="actualNonBilledTotalHours" title="${uiLabelMap.ProjectMgrNonBilledActualHours}"><display description="${groovy:isBillable&&actualNonBilledTotalHours!=void?actualNonBilledTotalHours:""}"/></field> <field name="createdStamp" title="${uiLabelMap.FormFieldTitle_createdDate}"><display type="date"/></field> </form> <form name="EditSubProjects" list-name="projects" type="list" target="RemoveSubProject" Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed May 27 20:39:43 2015 @@ -522,7 +522,7 @@ </actions> <field name="noteId"><hidden/></field> <field name="workEffortId"><hidden/></field> - <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field> + <field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${groovy:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${groovy: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field> <field name="internalNote" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals("N")"> <hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPrivate}"> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Wed May 27 20:39:43 2015 @@ -42,7 +42,7 @@ <entity-order-by field-name="sequenceNum"/> <entity-order-by field-name="workEffortName"/> </entity-options> - <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}"> + <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}"> <parameter param-name="workEffortId"/> <parameter param-name="my"/> </sub-hyperlink> @@ -130,8 +130,8 @@ <set field="complete" value="${uiLabelMap.ProjectMgrToComplete}"/> </actions> <row-actions> - <set field="actualHours" value="${bsh:org.ofbiz.project.Various.calculateActualHours(delegator, timesheetId)}"/> - <set field="completeLink" value="${bsh:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/> + <set field="actualHours" value="${groovy:org.ofbiz.project.Various.calculateActualHours(delegator, timesheetId)}"/> + <set field="completeLink" value="${groovy:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/> </row-actions> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${timesheetId}" target="Timesheet"> Modified: ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/MyWorkForms.xml Wed May 27 20:39:43 2015 @@ -132,7 +132,7 @@ <drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]"> <list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/> <entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/> - <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank"> + <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank"> <parameter param-name="taskId" from-field="workEffortId"/> </sub-hyperlink> </drop-down> Modified: ofbiz/trunk/specialpurpose/scrum/widget/MyWorkScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/MyWorkScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/MyWorkScreens.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/MyWorkScreens.xml Wed May 27 20:39:43 2015 @@ -120,13 +120,13 @@ under the License. <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> </condition> <widgets> - <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}" + <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}" navigation-form-name="WeekTimesheet"> <include-form name="WeekTimesheet" location="component://scrum/widget/MyWorkForms.xml"/> </screenlet> </widgets> <fail-widgets> - <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${bsh:timesheet.get("thruDate").toString().substring(0,10)}" + <screenlet title="${uiLabelMap.PageTitleCurrentTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} ${groovy:timesheet.get("thruDate").toString().substring(0,10)}" navigation-menu-name="TimesheetBar"> <include-menu name="TimesheetBar" location="component://scrum/widget/scrumMenus.xml"/> <include-form name="EditWeekTimesheet" location="component://scrum/widget/MyWorkForms.xml"/> Modified: ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/TaskScreens.xml Wed May 27 20:39:43 2015 @@ -223,7 +223,7 @@ under the License. <set field="tabButtonItem" value="Members"/> <set field="labelTitleProperty" value="PageTitleListWorkEffortPartyAssigns"/> <set field="workEffortId" from-field="parameters.taskId"/> - <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> + <set field="nowDate" value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy-MM-dd HH:mm:ss.S")}" type="String"/> </actions> <widgets> <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> Modified: ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetForms.xml Wed May 27 20:39:43 2015 @@ -61,7 +61,7 @@ <set field="inProcess" value="Set To In-progress"/> </actions> <row-actions> - <set field="completeLink" value="${bsh:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/> + <set field="completeLink" value="${groovy:"TIMESHEET_IN_PROCESS".equals(statusId)?complete:""}"/> </row-actions> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${timesheetId}" target="ViewTimeSheet"> @@ -145,7 +145,7 @@ <drop-down allow-empty="true" current-description="${result.projectId} ${product.productId} - ${result.projectName}${product.internalName} - ${result.sprintName} - ${groovy:result.backlogName.toString().substring(0,Math.min(result.backlogName.toString().length(),30))}[${result.backlogId}] - ${groovy:result.taskName.toString().substring(0,Math.min(result.taskName.toString().length(),30))}[${result.taskId}]"> <list-options key-name="taskId" list-name="taskListDropdown" description="${projectId}${productId} - ${projectName} ${productName} - ${sprintName} - ${groovy: if (description) description.substring(0,Math.min(description.length(),30))} [${custRequestId}] - ${groovy:taskName.substring(0,Math.min(taskName.length(),20))}[${taskId}]"/> <entity-options description="${description}" entity-name="EmplLeaveType" key-field-name="leaveTypeId"/> - <sub-hyperlink target="taskView" description="${bsh:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank"> + <sub-hyperlink target="taskView" description="${groovy:workEffortId!=void&&!"Totals".equals(workEffortId)?workEffortId:""}" target-window="_blank"> <parameter param-name="taskId" from-field="workEffortId"/> </sub-hyperlink> </drop-down> Modified: ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/TimeSheetScreens.xml Wed May 27 20:39:43 2015 @@ -62,8 +62,8 @@ under the License. <decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleTimesheet} ${uiLabelMap.CommonNbr} ${timesheet.timesheetId} ${uiLabelMap.CommonWeek}: ${weekNumber} - ${uiLabelMap.CommonFrom} ${bsh:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} - ${bsh:timesheet.get("thruDate").toString().substring(0,10)} ${uiLabelMap.PartyParty} : ${partyNameViewMap.lastName} ${partyNameViewMap.firstName} ${partyNameViewMap.middleName} [${timesheet.partyId}]"> + ${uiLabelMap.CommonFrom} ${groovy:timesheet.get("fromDate").toString().substring(0,10)} ${uiLabelMap.CommonTo} + ${groovy:timesheet.get("thruDate").toString().substring(0,10)} ${uiLabelMap.PartyParty} : ${partyNameViewMap.lastName} ${partyNameViewMap.firstName} ${partyNameViewMap.middleName} [${timesheet.partyId}]"> <section> <condition> <if-compare field="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/> Modified: ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml?rev=1682118&r1=1682117&r2=1682118&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml (original) +++ ofbiz/trunk/specialpurpose/scrum/widget/scrumMenus.xml Wed May 27 20:39:43 2015 @@ -253,7 +253,7 @@ under the License. <menu name="ProductTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <actions> <set field="productId" from-field="parameters.productId"/> - <set field="hasUpdatePermission" value="${bsh: + <set field="hasUpdatePermission" value="${groovy: result = dispatcher.runSync("scrumPermissionCheck", org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"), "resourceDescription", "PRODUCT", @@ -633,7 +633,7 @@ under the License. menu-container-style="button-bar button-style-2"> <actions> <set field="productId" from-field="parameters.productId"/> - <set field="hasViewPermission" value="${bsh: + <set field="hasViewPermission" value="${groovy: result = dispatcher.runSync("scrumPermissionCheck", org.ofbiz.base.util.UtilMisc.toMap("userLogin", parameters.get("userLogin"), "resourceDescription", "PRODUCT", |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |