You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/01/08 09:40:09 UTC
svn commit: r1556464 - in /ofbiz/trunk/applications/product:
webapp/facility/WEB-INF/controller.xml widget/facility/FacilityForms.xml
widget/facility/FacilityMenus.xml widget/facility/FacilityScreens.xml
Author: jleroux
Date: Wed Jan 8 08:40:08 2014
New Revision: 1556464
URL: http://svn.apache.org/r1556464
Log:
I was wrong renaming it from Edit to View at r1555884 http://svn.apache.org/r1555884. I did not see that there is a, by default hidden, upper part of the screen where you can enter data. So it's an interesting complement to Party Geo Location update screen where you edit a party geo location using Google Map (address search and goe point displacement on map).
Modified:
ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1556464&r1=1556463&r2=1556464&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Jan 8 08:40:08 2014
@@ -832,15 +832,15 @@ under the License.
<response name="error" type="view" value="EditFacilityContent"/>
</request-map>
- <request-map uri="ViewFacilityGeoPoint">
+ <request-map uri="EditFacilityGeoPoint">
<security https="true" auth="true"/>
- <response name="success" type="view" value="ViewFacilityGeoPoint"/>
+ <response name="success" type="view" value="EditFacilityGeoPoint"/>
</request-map>
<request-map uri="createUpdateFacilityGeoPoint">
<security auth="true" https="true"/>
<event type="service" path="" invoke="createUpdateFacilityGeoPoint"/>
- <response name="success" type="view" value="ViewFacilityGeoPoint"/>
- <response name="error" type="view" value="ViewFacilityGeoPoint"/>
+ <response name="success" type="view" value="EditFacilityGeoPoint"/>
+ <response name="error" type="view" value="EditFacilityGeoPoint"/>
</request-map>
<!-- ================ Shipment Scheduling Requests ================= -->
<request-map uri="Scheduling">
@@ -1407,7 +1407,7 @@ under the License.
<view-map name="BatchPrintShippingLabels" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#BatchPrintShippingLabels" content-type="application/pdf" encoding="none"/>
<view-map name="EditFacilityContent" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityContent"/>
- <view-map name="ViewFacilityGeoPoint" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityGeoPoint"/>
+ <view-map name="EditFacilityGeoPoint" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityGeoPoint"/>
<view-map name="FindShipment" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#FindShipment"/>
<view-map name="ViewShipment" type="screen" page="component://product/widget/facility/ShipmentScreens.xml#ViewShipment"/>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml?rev=1556464&r1=1556463&r2=1556464&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityForms.xml Wed Jan 8 08:40:08 2014
@@ -902,7 +902,7 @@ under the License.
</field>
</form>
- <form name="ViewFacilityGeoPoint" type="single" target="createUpdateFacilityGeoPoint" default-map-name="geoPoint"
+ <form name="EditFacilityGeoPoint" type="single" target="createUpdateFacilityGeoPoint" default-map-name="geoPoint"
default-table-style="basic-table">
<field name="facilityId"><hidden value="${facilityId}"/></field>
<field name="geoPointId"><hidden/></field>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml?rev=1556464&r1=1556463&r2=1556464&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityMenus.xml Wed Jan 8 08:40:08 2014
@@ -156,8 +156,8 @@ under the License.
<parameter param-name="facilityId"/>
</link>
</menu-item>
- <menu-item name="ViewFacilityGeoPoint" title="${uiLabelMap.CommonGeoLocation}">
- <link target="ViewFacilityGeoPoint">
+ <menu-item name="EditFacilityGeoPoint" title="${uiLabelMap.CommonGeoLocation}">
+ <link target="EditFacilityGeoPoint">
<parameter param-name="facilityId"/>
</link>
</menu-item>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=1556464&r1=1556463&r2=1556464&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Jan 8 08:40:08 2014
@@ -1510,10 +1510,10 @@ under the License.
</section>
</screen>
- <screen name="ViewFacilityGeoPoint">
+ <screen name="EditFacilityGeoPoint">
<section>
<actions>
- <set field="tabButtonItem" value="ViewFacilityGeoPoint"/>
+ <set field="tabButtonItem" value="EditFacilityGeoPoint"/>
<set field="facilityId" from-field="parameters.facilityId"/>
<entity-one entity-name="Facility" value-field="facility"/>
<get-related-one relation-name="GeoPoint" to-value-field="geoPoint" value-field="facility"/>
@@ -1532,7 +1532,7 @@ under the License.
<decorator-section name="body">
<container style="page-title"><label text="${title}"/></container>
<screenlet id="edit-facility-geopoint" title="${uiLabelMap.ProductEditFacilityGeoLocation}" collapsible="true" initially-collapsed="true">
- <include-form name="ViewFacilityGeoPoint" location="component://product/widget/facility/FacilityForms.xml"/>
+ <include-form name="EditFacilityGeoPoint" location="component://product/widget/facility/FacilityForms.xml"/>
</screenlet>
<include-screen name="geoChart" location="component://common/widget/CommonScreens.xml"/>
</decorator-section>