You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2010/02/03 11:23:10 UTC
svn commit: r905972 -
/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
Author: hansbak
Date: Wed Feb 3 10:23:08 2010
New Revision: 905972
URL: http://svn.apache.org/viewvc?rev=905972&view=rev
Log:
project mgr resources list was not ligned up when telephone blank + spelling error
Modified:
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=905972&r1=905971&r2=905972&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Wed Feb 3 10:23:08 2010
@@ -36,7 +36,7 @@
</hyperlink>
</field>
<field name="roleTypeId"><hidden/></field>
- <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}">
+ <field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}">
<hyperlink target="/partymgr/control/EditCommunicationEvent" description="${emailResult.emailAddress}" target-type="inter-app">
<parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
<parameter param-name="partyIdTo" from-field="partyId"/>
@@ -45,8 +45,7 @@
<parameter param-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</hyperlink>
</field>
- <field use-when="telResult.get("extension")!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field>
- <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field>
+ <field name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}${groovy:telResult.get("extension")!=null?" Ext:":" "}${telResult.extension}"/></field>
<field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
<field name="remove" title="${uiLabelMap.CommonRemove}">
<hyperlink target="removeResource" description="${uiLabelMap.CommonRemove}">
Re: svn commit: r905972 - /ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
Posted by Adam Heath <do...@brainfood.com>.
hansbak@apache.org wrote:
> Author: hansbak
> Date: Wed Feb 3 10:23:08 2010
> New Revision: 905972
>
> URL: http://svn.apache.org/viewvc?rev=905972&view=rev
> Log:
> project mgr resources list was not ligned up when telephone blank + spelling error
There are 2 commits here, it's bad form to combine them.
> Modified:
> ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
>
> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=905972&r1=905971&r2=905972&view=diff
> ==============================================================================
> --- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
> +++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Wed Feb 3 10:23:08 2010
> @@ -36,7 +36,7 @@
> </hyperlink>
> </field>
> <field name="roleTypeId"><hidden/></field>
> - <field name="emailAddess" title="${uiLabelMap.PartyEmailAddress}">
> + <field name="emailAddress" title="${uiLabelMap.PartyEmailAddress}">
> <hyperlink target="/partymgr/control/EditCommunicationEvent" description="${emailResult.emailAddress}" target-type="inter-app">
> <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/>
> <parameter param-name="partyIdTo" from-field="partyId"/>
This is a typo, not a spelling error. Spelling error is for some
purely informational text label. This issue you discovered is a bug,
so needs to be described as such.
> @@ -45,8 +45,7 @@
> <parameter param-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
> </hyperlink>
> </field>
> - <field use-when="telResult.get("extension")!=null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber} Ext:${telResult.extension}"/></field>
> - <field use-when="telResult.get("extension")==null" name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}"/></field>
> + <field name="telephone" title="${uiLabelMap.PartyPhoneNumber}"><display description="${telResult.countryCode} ${telResult.areaCode} ${telResult.contactNumber}${groovy:telResult.get("extension")!=null?" Ext:":" "}${telResult.extension}"/></field>
> <field name="contactMechPurposeTypeId" entry-name="telResult.contactMechPurposeTypeId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="ContactMechPurposeType"/></field>
> <field name="remove" title="${uiLabelMap.CommonRemove}">
> <hyperlink target="removeResource" description="${uiLabelMap.CommonRemove}">
This commit has nothing to do with the other, except the fact that
they share the same file.
That's not reason enough to combine.