Re: svn commit: r1199681 - in /ofbiz/trunk/applications/party: script/org/ofbiz/party/party/PartySimpleEvents.xml widget/partymgr/PartyForms.xml widget/partymgr/ProfileScreens.xml

[Jacques Le Roux]

There is a small issue with this commit see https://issues.apache.org/jira/browse/OFBIZ-6708

Jacques

Le 09/11/2011 11:08, [hidden email] a écrit :

> Author: hansbak
> Date: Wed Nov  9 10:08:22 2011
> New Revision: 1199681
>
> URL: http://svn.apache.org/viewvc?rev=1199681&view=rev
> Log:
> party logo not always properly displayed and public flag was not possible to modify: fixed
>
> Modified:
>      ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
>      ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
>      ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>
> Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml?rev=1199681&r1=1199680&r2=1199681&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml (original)
> +++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartySimpleEvents.xml Wed Nov  9 10:08:22 2011
> @@ -89,7 +89,7 @@ under the License.
>                <field field="formInput" type="java.util.Map"/>
>           </call-class-method>
>  
> -        <set-service-fields service-name="createPartyContent" map="formInput.formInput" to-map="partyContentMap"/>
> +        <set-service-fields service-name="uploadPartyContentFile" map="formInput.formInput" to-map="partyContentMap"/>
>           <set field="partyContentMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
>           <set field="partyContentMap.uploadedFile" from-field="byteWrap"/>
>           <set field="partyContentMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
> @@ -115,11 +115,8 @@ under the License.
>              >
>                <field field="formInput" type="java.util.Map"/>
>            </call-class-method >
> -         <set-service-fields service-name="updatePartyContent" map="formInput.formInput" to-map="partyContentMap"/>
> -         <set field="partyContentMap._uploadedFile_fileName" from-field="formInput.imageFileName"/>
> -         <set field="partyContentMap.uploadedFile" from-field="byteWrap"/>
> -         <set field="partyContentMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/>
> -         <call-service service-name="updatePartyContent" in-map-name="partyContentMap" break-on-error="false" >
> +         <set-service-fields service-name="updateContentAndUploadedFile" map="formInput.formInput" to-map="partyContentMap"/>
> +         <call-service service-name="updateContentAndUploadedFile" in-map-name="partyContentMap" break-on-error="false">
>               <result-to-field result-name="contentId" field="contentId"/>
>            </call-service>
>           <!-- set the partyId in the request -->
>
> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml?rev=1199681&r1=1199680&r2=1199681&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/PartyForms.xml Wed Nov  9 10:08:22 2011
> @@ -134,7 +134,7 @@ under the License.
>  
>       <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
>           <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
> -        <field name="logo" use-when="organizationLogoLinkURL!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${organizationLogoLinkURL}"/></field>
> +        <field name="logo" use-when="partyGroupLogoLinkUrl!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${partyGroupLogoLinkUrl}"/></field>
>           <field name="partyTypeId"><ignored/></field>
>           <field name="comments"><ignored/></field>
>           <field name="logoImageUrl"><ignored/></field>
> @@ -571,6 +571,7 @@ under the License.
>           <!-- <auto-fields-entity entity-name="Content"/> -->
>  
>           <field name="partyId" map-name="parameters"><hidden/></field>
> +        <field name="dataResourceId" map-name="dataResource" use-when="content!=null"><hidden/></field>
>           <field use-when="content!=null" name="contentId" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
>           <field name="partyContentTypeId">
>               <drop-down allow-empty="false">
> @@ -622,6 +623,12 @@ under the License.
>                  <entity-options description="${categoryName}" entity-name="DataCategory"/>
>               </drop-down>
>           </field>
> +        <field name="isPublic" title="${uiLabelMap.PartyIsPublic}" map-name="dataResource">
> +            <drop-down no-current-selected-key="N">
> +                <option key="N" description="${uiLabelMap.CommonNo}"/>
> +                <option key="Y" description="${uiLabelMap.CommonYes}"/>
> +            </drop-down>
> +        </field>
>           <field name="createButton" use-when="content==null"><submit button-type="button"/></field>
>           <field name="updateButton" use-when="content!=null"><submit button-type="button"/></field>
>       </form>
>
> Modified: ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1199681&r1=1199680&r2=1199681&view=diff
> ==============================================================================
> --- ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml (original)
> +++ ofbiz/trunk/applications/party/widget/partymgr/ProfileScreens.xml Wed Nov  9 10:08:22 2011
> @@ -25,7 +25,6 @@
>               <actions>
>                   <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
>                   <set field="parameters.partyId" from-field="parameters.partyId" default-value="${userLogin.partyId}"/>
> -                <set field="organizationLogoLinkURL" from-field="layoutSettings.organizationLogoLinkUrl"/>
>                   <entity-and entity-name="PartyNameHistory" list="partyNameHistoryList">
>                       <field-map field-name="partyId" from-field="parameters.partyId"/>
>                       <order-by field-name="-changeDate"/>
> @@ -36,6 +35,14 @@
>                   <entity-one entity-name="PartyAndPerson" value-field="lookupPerson">
>                       <field-map field-name="partyId" from-field="parameters.partyId"/><!-- is required -->
>                   </entity-one>
> +                <entity-and list="partyContentList" entity-name="PartyContent">
> +                    <field-map field-name="partyId" from-field="parameters.partyId"/>
> +                    <field-map field-name="partyContentTypeId" value="LGOIMGURL"/>
> +                    <order-by field-name="-fromDate"/>
> +                </entity-and>
> +                <set field="partyContentId" from-field="partyContentList[0].contentId"/>
> +                <set field="partyContent" value="${groovy: partyContentId!=null?&quot;stream?contentId=&quot; + partyContentId : &quot;&quot;}"/>
> +                <set field="partyGroupLogoLinkUrl" from-field="partyContent" default-value="${lookupGroup.logoImageUrl}" global="true"/>
>               </actions>
>               <widgets>
>                   <section>
>
>