You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacopo Cappellato <ja...@hotwaxmedia.com> on 2014/09/21 09:40:56 UTC
Re: svn commit: r1598915 - in /ofbiz/branches/release11.04: ./ applications/product/webapp/catalog/WEB-INF/ applications/product/widget/catalog/ framework/base/cert/ framework/base/cert/demoCA/newcerts/ framework/base/config/
Jacques,
I suspect that in this commit you included some modifications to certificates that were not intended to be backported; specifically:
> Added:
> ofbiz/branches/release11.04/framework/base/cert/README
> ofbiz/branches/release11.04/framework/base/cert/demoCA/newcerts/03.pem
> Modified:
> ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
Could you please double check?
Jacopo
On May 31, 2014, at 10:12 PM, jleroux@apache.org wrote:
> Author: jleroux
> Date: Sat May 31 20:12:50 2014
> New Revision: 1598915
>
> URL: http://svn.apache.org/r1598915
> Log:
> "Applied fix from trunk for revision: 1598913 "
> ------------------------------------------------------------------------
> r1598913 | jleroux | 2014-05-31 22:10:54 +0200 (sam. 31 mai 2014) | 8 lignes
>
> A patche from Olivier Heintz for "ProductStoreFacilities page does not refresh information after actions are performed" https://issues.apache.org/jira/browse/OFBIZ-5408
>
> The ProductStoreFacilities page does not refresh when actions are performed. When adding or deleting a facility from the store, the result of either action is not reflected on the page even though both are performed. A loading icon appears after clicking action buttons/links so AJAX is probably being used.
>
> Olivier:
> bug corrections :
> 1) areaId was wrong in on-event for edit and in delete button in list
> 2) replace wrong view-map ListProductStoreFacilityFormOnly by ListProductStoreFacility
> ------------------------------------------------------------------------
>
>
> Added:
> ofbiz/branches/release11.04/framework/base/cert/README
> - copied unchanged from r1598544, ofbiz/trunk/framework/base/cert/README
> ofbiz/branches/release11.04/framework/base/cert/demoCA/newcerts/03.pem
> - copied unchanged from r1598544, ofbiz/trunk/framework/base/cert/demoCA/newcerts/03.pem
> Modified:
> ofbiz/branches/release11.04/ (props changed)
> ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml
> ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml
> ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
> ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
>
> Propchange: ofbiz/branches/release11.04/
> ------------------------------------------------------------------------------
> Merged /ofbiz/trunk:r1598544,1598913
>
> Modified: ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
> ==============================================================================
> --- ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
> +++ ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml Sat May 31 20:12:50 2014
> @@ -2299,7 +2299,7 @@ under the License.
> </request-map>
> <request-map uri="ListProductStoreFacilityFormOnly">
> <security https="true" auth="true"/>
> - <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
> + <response name="success" type="view" value="ListProductStoreFacility"/>
> </request-map>
> <request-map uri="editProductStoreFacility"><security https="true" auth="true"/>
> <response name="success" type="view" value="EditProductStoreFacility"/>
> @@ -2319,8 +2319,8 @@ under the License.
> <request-map uri="deleteProductStoreFacility">
> <security https="true" auth="true"/>
> <event type="service" invoke="deleteProductStoreFacility"/>
> - <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
> - <response name="error" type="view" value="ListProductStoreFacilityFormOnly"/>
> + <response name="success" type="view" value="ListProductStoreFacility"/>
> + <response name="error" type="view" value="ListProductStoreFacility"/>
> </request-map>
>
> <!-- ================ Keyword Thesaurus Requests ================= -->
> @@ -3138,7 +3138,6 @@ under the License.
> <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
> <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/>
> <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/>
> - <view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/>
> <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/>
> <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/>
> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>
>
> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
> ==============================================================================
> --- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml (original)
> +++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml Sat May 31 20:12:50 2014
> @@ -127,7 +127,7 @@ under the License.
> <field name="fromDate" ><display type="date-time" /></field>
> <field name="thruDate" ><display type="date-time" /></field>
> <field name="deleteLink" title=" " >
> - <hyperlink target="javascript:ajaxUpdateArea('PrdStoreFacilityMgmtArea', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
> + <hyperlink target="javascript:ajaxUpdateArea('PP_ProductStoreFacilityPrdStoreFacilityMgmt00001', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
> target-type="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}">
> </hyperlink>
> </field>
> @@ -151,6 +151,6 @@ under the License.
> <field name="submitButton" title="${groovy: productStoreFacility == null ? uiLabelMap.CommonAdd : uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
> <submit button-type="button"/>
> </field>
> - <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmtArea" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/>
> + <on-event-update-area event-type="submit" area-id="PP_ProductStoreFacilityPrdStoreFacilityMgmt00001" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/>
> </form>
> </forms>
>
> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
> ==============================================================================
> --- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml (original)
> +++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml Sat May 31 20:12:50 2014
> @@ -580,6 +580,8 @@ under the License.
> <set field="titleProperty" value="ProductStoreFacilityAssocList"/>
> <set field="tabButtonItem" value="EditProductStoreFacilities"/>
> <set field="productStoreId" from-field="parameters.productStoreId"/>
> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
> <set field="portalPageId" value="ProductStoreFacility"/>
> </actions>
> <widgets>
>
> Modified: ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks?rev=1598915&r1=1598914&r2=1598915&view=diff
> ==============================================================================
> Binary files - no diff available.
>
>
Re: svn commit: r1598915 - in /ofbiz/branches/release11.04: ./ applications/product/webapp/catalog/WEB-INF/ applications/product/widget/catalog/ framework/base/cert/ framework/base/cert/demoCA/newcerts/ framework/base/config/
Posted by Jacopo Cappellato <ja...@hotwaxmedia.com>.
No need to revert.
Jacopo
On Sep 22, 2014, at 9:21 PM, Jacques Le Roux <ja...@les7arts.com> wrote:
> Oops indeed, even if actually this has no impact and is even better for new R11 releases which have now a 10 years ahead certificate (rather than a deprecated one since 2008 ;)
>
> If you want I can revert, but I see no issue keeping things like that
>
> Jacques
>
> Le 21/09/2014 09:40, Jacopo Cappellato a écrit :
>> Jacques,
>>
>> I suspect that in this commit you included some modifications to certificates that were not intended to be backported; specifically:
>>
>>> Added:
>>> ofbiz/branches/release11.04/framework/base/cert/README
>>> ofbiz/branches/release11.04/framework/base/cert/demoCA/newcerts/03.pem
>>> Modified:
>>> ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
>> Could you please double check?
>>
>> Jacopo
>>
>>
>> On May 31, 2014, at 10:12 PM, jleroux@apache.org wrote:
>>
>>> Author: jleroux
>>> Date: Sat May 31 20:12:50 2014
>>> New Revision: 1598915
>>>
>>> URL: http://svn.apache.org/r1598915
>>> Log:
>>> "Applied fix from trunk for revision: 1598913 "
>>> ------------------------------------------------------------------------
>>> r1598913 | jleroux | 2014-05-31 22:10:54 +0200 (sam. 31 mai 2014) | 8 lignes
>>>
>>> A patche from Olivier Heintz for "ProductStoreFacilities page does not refresh information after actions are performed" https://issues.apache.org/jira/browse/OFBIZ-5408
>>>
>>> The ProductStoreFacilities page does not refresh when actions are performed. When adding or deleting a facility from the store, the result of either action is not reflected on the page even though both are performed. A loading icon appears after clicking action buttons/links so AJAX is probably being used.
>>>
>>> Olivier:
>>> bug corrections :
>>> 1) areaId was wrong in on-event for edit and in delete button in list
>>> 2) replace wrong view-map ListProductStoreFacilityFormOnly by ListProductStoreFacility
>>> ------------------------------------------------------------------------
>>>
>>>
>>> Added:
>>> ofbiz/branches/release11.04/framework/base/cert/README
>>> - copied unchanged from r1598544, ofbiz/trunk/framework/base/cert/README
>>> ofbiz/branches/release11.04/framework/base/cert/demoCA/newcerts/03.pem
>>> - copied unchanged from r1598544, ofbiz/trunk/framework/base/cert/demoCA/newcerts/03.pem
>>> Modified:
>>> ofbiz/branches/release11.04/ (props changed)
>>> ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml
>>> ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml
>>> ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
>>> ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
>>>
>>> Propchange: ofbiz/branches/release11.04/
>>> ------------------------------------------------------------------------------
>>> Merged /ofbiz/trunk:r1598544,1598913
>>>
>>> Modified: ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
>>> ==============================================================================
>>> --- ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
>>> +++ ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml Sat May 31 20:12:50 2014
>>> @@ -2299,7 +2299,7 @@ under the License.
>>> </request-map>
>>> <request-map uri="ListProductStoreFacilityFormOnly">
>>> <security https="true" auth="true"/>
>>> - <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
>>> + <response name="success" type="view" value="ListProductStoreFacility"/>
>>> </request-map>
>>> <request-map uri="editProductStoreFacility"><security https="true" auth="true"/>
>>> <response name="success" type="view" value="EditProductStoreFacility"/>
>>> @@ -2319,8 +2319,8 @@ under the License.
>>> <request-map uri="deleteProductStoreFacility">
>>> <security https="true" auth="true"/>
>>> <event type="service" invoke="deleteProductStoreFacility"/>
>>> - <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
>>> - <response name="error" type="view" value="ListProductStoreFacilityFormOnly"/>
>>> + <response name="success" type="view" value="ListProductStoreFacility"/>
>>> + <response name="error" type="view" value="ListProductStoreFacility"/>
>>> </request-map>
>>>
>>> <!-- ================ Keyword Thesaurus Requests ================= -->
>>> @@ -3138,7 +3138,6 @@ under the License.
>>> <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
>>> <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/>
>>> <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/>
>>> - <view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/>
>>> <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/>
>>> <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/>
>>> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>
>>>
>>> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
>>> ==============================================================================
>>> --- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml (original)
>>> +++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml Sat May 31 20:12:50 2014
>>> @@ -127,7 +127,7 @@ under the License.
>>> <field name="fromDate" ><display type="date-time" /></field>
>>> <field name="thruDate" ><display type="date-time" /></field>
>>> <field name="deleteLink" title=" " >
>>> - <hyperlink target="javascript:ajaxUpdateArea('PrdStoreFacilityMgmtArea', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
>>> + <hyperlink target="javascript:ajaxUpdateArea('PP_ProductStoreFacilityPrdStoreFacilityMgmt00001', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
>>> target-type="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}">
>>> </hyperlink>
>>> </field>
>>> @@ -151,6 +151,6 @@ under the License.
>>> <field name="submitButton" title="${groovy: productStoreFacility == null ? uiLabelMap.CommonAdd : uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
>>> <submit button-type="button"/>
>>> </field>
>>> - <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmtArea" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/>
>>> + <on-event-update-area event-type="submit" area-id="PP_ProductStoreFacilityPrdStoreFacilityMgmt00001" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/>
>>> </form>
>>> </forms>
>>>
>>> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
>>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
>>> ==============================================================================
>>> --- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml (original)
>>> +++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml Sat May 31 20:12:50 2014
>>> @@ -580,6 +580,8 @@ under the License.
>>> <set field="titleProperty" value="ProductStoreFacilityAssocList"/>
>>> <set field="tabButtonItem" value="EditProductStoreFacilities"/>
>>> <set field="productStoreId" from-field="parameters.productStoreId"/>
>>> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
>>> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
>>> <set field="portalPageId" value="ProductStoreFacility"/>
>>> </actions>
>>> <widgets>
>>>
>>> Modified: ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
>>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks?rev=1598915&r1=1598914&r2=1598915&view=diff
>>> ==============================================================================
>>> Binary files - no diff available.
>>>
>>>
>>
>>
>
Re: svn commit: r1598915 - in /ofbiz/branches/release11.04: ./ applications/product/webapp/catalog/WEB-INF/
applications/product/widget/catalog/ framework/base/cert/ framework/base/cert/demoCA/newcerts/
framework/base/config/
Posted by Jacques Le Roux <ja...@les7arts.com>.
Oops indeed, even if actually this has no impact and is even better for new R11 releases which have now a 10 years ahead certificate (rather than a
deprecated one since 2008 ;)
If you want I can revert, but I see no issue keeping things like that
Jacques
Le 21/09/2014 09:40, Jacopo Cappellato a écrit :
> Jacques,
>
> I suspect that in this commit you included some modifications to certificates that were not intended to be backported; specifically:
>
>> Added:
>> ofbiz/branches/release11.04/framework/base/cert/README
>> ofbiz/branches/release11.04/framework/base/cert/demoCA/newcerts/03.pem
>> Modified:
>> ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
> Could you please double check?
>
> Jacopo
>
>
> On May 31, 2014, at 10:12 PM, jleroux@apache.org wrote:
>
>> Author: jleroux
>> Date: Sat May 31 20:12:50 2014
>> New Revision: 1598915
>>
>> URL: http://svn.apache.org/r1598915
>> Log:
>> "Applied fix from trunk for revision: 1598913 "
>> ------------------------------------------------------------------------
>> r1598913 | jleroux | 2014-05-31 22:10:54 +0200 (sam. 31 mai 2014) | 8 lignes
>>
>> A patche from Olivier Heintz for "ProductStoreFacilities page does not refresh information after actions are performed" https://issues.apache.org/jira/browse/OFBIZ-5408
>>
>> The ProductStoreFacilities page does not refresh when actions are performed. When adding or deleting a facility from the store, the result of either action is not reflected on the page even though both are performed. A loading icon appears after clicking action buttons/links so AJAX is probably being used.
>>
>> Olivier:
>> bug corrections :
>> 1) areaId was wrong in on-event for edit and in delete button in list
>> 2) replace wrong view-map ListProductStoreFacilityFormOnly by ListProductStoreFacility
>> ------------------------------------------------------------------------
>>
>>
>> Added:
>> ofbiz/branches/release11.04/framework/base/cert/README
>> - copied unchanged from r1598544, ofbiz/trunk/framework/base/cert/README
>> ofbiz/branches/release11.04/framework/base/cert/demoCA/newcerts/03.pem
>> - copied unchanged from r1598544, ofbiz/trunk/framework/base/cert/demoCA/newcerts/03.pem
>> Modified:
>> ofbiz/branches/release11.04/ (props changed)
>> ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml
>> ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml
>> ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
>> ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
>>
>> Propchange: ofbiz/branches/release11.04/
>> ------------------------------------------------------------------------------
>> Merged /ofbiz/trunk:r1598544,1598913
>>
>> Modified: ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
>> ==============================================================================
>> --- ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
>> +++ ofbiz/branches/release11.04/applications/product/webapp/catalog/WEB-INF/controller.xml Sat May 31 20:12:50 2014
>> @@ -2299,7 +2299,7 @@ under the License.
>> </request-map>
>> <request-map uri="ListProductStoreFacilityFormOnly">
>> <security https="true" auth="true"/>
>> - <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
>> + <response name="success" type="view" value="ListProductStoreFacility"/>
>> </request-map>
>> <request-map uri="editProductStoreFacility"><security https="true" auth="true"/>
>> <response name="success" type="view" value="EditProductStoreFacility"/>
>> @@ -2319,8 +2319,8 @@ under the License.
>> <request-map uri="deleteProductStoreFacility">
>> <security https="true" auth="true"/>
>> <event type="service" invoke="deleteProductStoreFacility"/>
>> - <response name="success" type="view" value="ListProductStoreFacilityFormOnly"/>
>> - <response name="error" type="view" value="ListProductStoreFacilityFormOnly"/>
>> + <response name="success" type="view" value="ListProductStoreFacility"/>
>> + <response name="error" type="view" value="ListProductStoreFacility"/>
>> </request-map>
>>
>> <!-- ================ Keyword Thesaurus Requests ================= -->
>> @@ -3138,7 +3138,6 @@ under the License.
>> <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/>
>> <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/>
>> <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/>
>> - <view-map name="ListProductStoreFacilityFormOnly" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacilityFormOnly" type="screen"/>
>> <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/>
>> <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/>
>> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>
>>
>> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
>> ==============================================================================
>> --- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml (original)
>> +++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreForms.xml Sat May 31 20:12:50 2014
>> @@ -127,7 +127,7 @@ under the License.
>> <field name="fromDate" ><display type="date-time" /></field>
>> <field name="thruDate" ><display type="date-time" /></field>
>> <field name="deleteLink" title=" " >
>> - <hyperlink target="javascript:ajaxUpdateArea('PrdStoreFacilityMgmtArea', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
>> + <hyperlink target="javascript:ajaxUpdateArea('PP_ProductStoreFacilityPrdStoreFacilityMgmt00001', 'deleteProductStoreFacility', 'productStoreId=${productStoreId}&facilityId=${facilityId}&fromDate=${fromDate}');"
>> target-type="plain" request-confirmation="true" image-location="/images/mini-trash.png" image-title="${uiLabelMap.CommonRemove}">
>> </hyperlink>
>> </field>
>> @@ -151,6 +151,6 @@ under the License.
>> <field name="submitButton" title="${groovy: productStoreFacility == null ? uiLabelMap.CommonAdd : uiLabelMap.CommonUpdate}" widget-style="smallSubmit">
>> <submit button-type="button"/>
>> </field>
>> - <on-event-update-area event-type="submit" area-id="PrdStoreFacilityMgmtArea" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/>
>> + <on-event-update-area event-type="submit" area-id="PP_ProductStoreFacilityPrdStoreFacilityMgmt00001" area-target="ListProductStoreFacilityFormOnly?portalPortletId=PrdStoreFacilityMgmt&productStoreId=${parameters.productStoreId}"/>
>> </form>
>> </forms>
>>
>> Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml?rev=1598915&r1=1598914&r2=1598915&view=diff
>> ==============================================================================
>> --- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml (original)
>> +++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml Sat May 31 20:12:50 2014
>> @@ -580,6 +580,8 @@ under the License.
>> <set field="titleProperty" value="ProductStoreFacilityAssocList"/>
>> <set field="tabButtonItem" value="EditProductStoreFacilities"/>
>> <set field="productStoreId" from-field="parameters.productStoreId"/>
>> + <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
>> + <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
>> <set field="portalPageId" value="ProductStoreFacility"/>
>> </actions>
>> <widgets>
>>
>> Modified: ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks
>> URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/base/config/ofbizssl.jks?rev=1598915&r1=1598914&r2=1598915&view=diff
>> ==============================================================================
>> Binary files - no diff available.
>>
>>
>
>