svn commit: r1682445 - in /ofbiz/branches/release14.12: ./ framework/common/servicedef/services.xml framework/webtools/widget/GeoManagementForms.xml framework/webtools/widget/Menus.xml

Author: jleroux
Date: Fri May 29 12:39:49 2015
New Revision: 1682445

URL: http://svn.apache.org/r1682445
Log:
"Applied fix from trunk for revision: 1682415"
------------------------------------------------------------------------
r1682415 | taher | 2015-05-29 12:43:41 +0200 (ven. 29 mai 2015) | 16 lignes

Provide a fix for OFBIZ-6229 and allow creation of new Geos

Fix the following problems:

- The search screen results take you to the link geos.
  it should go directly to create / edit instead
- You cannot edit a geo because the parameter is not passed across
  the tabs link and edit / create. The menus should be redefined
  to pass the parameter around
- The primary key is enforced in the service definition when
  it should be optional to create new geos
- finally, the geoId should not be a lookup field as
  an entity cannot lookup itself

Refs https://issues.apache.org/jira/browse/OFBIZ-6229

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release14.12/   (props changed)
    ofbiz/branches/release14.12/framework/common/servicedef/services.xml
    ofbiz/branches/release14.12/framework/webtools/widget/GeoManagementForms.xml
    ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml

Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 29 12:39:49 2015
@@ -8,4 +8,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
 1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674,1677123,1677597,1677769-1677770,1678294,1678882,1678911,1679689,1679697,1679709,1679720,1679728,1679732,1679957,1680155,1680288,1680304,1680671,1680675,1680733,1680840,1680881,1682272,1682295,1682415

Modified: ofbiz/branches/release14.12/framework/common/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/servicedef/services.xml?rev=1682445&r1=1682444&r2=1682445&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/common/servicedef/services.xml (original)
+++ ofbiz/branches/release14.12/framework/common/servicedef/services.xml Fri May 29 12:39:49 2015
@@ -713,7 +713,7 @@ under the License.
     <service name="createGeo" default-entity-name="Geo" engine="entity-auto" invoke="create" auth="true">
         <description>Create a Geo</description>
         <permission-service service-name="commonGenericPermission" main-action="CREATE"/>
-        <auto-attributes include="pk" mode="INOUT"/>
+        <auto-attributes include="pk" mode="INOUT" optional="true"/>
         <auto-attributes include="nonpk" mode="IN" optional="true"/>
         <override name="geoName" optional="false"/>
         <override name="geoTypeId" optional="false"/>        

Modified: ofbiz/branches/release14.12/framework/webtools/widget/GeoManagementForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/widget/GeoManagementForms.xml?rev=1682445&r1=1682444&r2=1682445&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/webtools/widget/GeoManagementForms.xml (original)
+++ ofbiz/branches/release14.12/framework/webtools/widget/GeoManagementForms.xml Fri May 29 12:39:49 2015
@@ -26,7 +26,7 @@
     <form name="ListGeos" extends-resource="component://common/widget/LookupForms.xml" extends="listLookupGeo" paginate-target="${currentUrl}"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar" separate-columns="true" >
         <field name="geoId"  widget-style="buttontext" title="${uiLabelMap.CommonGeoId}">
-            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="LinkGeos">
+            <hyperlink also-hidden="false" target-type="plain" description="${geoId}"  target="EditGeo">
                 <parameter param-name="geoId"/>
             </hyperlink>
         </field>
@@ -42,7 +42,7 @@
     <form name="EditGeo" type="single" target="updateGeo" title="" default-map-name="geo"
         header-row-style="header-row" default-table-style="basic-table">
         <alt-target use-when="geo==null" target="createGeo"/>
-        <field name="geoId" title="${uiLabelMap.CommonGeoId}"><lookup target-form-name="LookupGeo"/></field>
+        <field name="geoId" title="${uiLabelMap.CommonGeoId}"><text/></field>
         <field name="geoTypeId" title="${uiLabelMap.CommonGeoTypeId}">
             <drop-down allow-empty="true">
                 <entity-options key-field-name="geoTypeId" entity-name="GeoType" description="${description}">

Modified: ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml?rev=1682445&r1=1682444&r2=1682445&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml (original)
+++ ofbiz/branches/release14.12/framework/webtools/widget/Menus.xml Fri May 29 12:39:49 2015
@@ -285,10 +285,14 @@ under the License.
             <link target="FindGeo"/>            
         </menu-item>
         <menu-item name="EditGeo" title="${uiLabelMap.WebtoolsGeoCreateNew}">
-            <link target="EditGeo"/>
+            <link target="EditGeo">
+                <parameter param-name="geoId" from-field="parameters.geoId"/>
+            </link>
         </menu-item>
         <menu-item name="LinkGeos" title="${uiLabelMap.WebtoolsGeosLink}">
-            <link target="LinkGeos"/>
+            <link target="LinkGeos">
+                <parameter param-name="geoId" from-field="parameters.geoId"/>
+            </link>
         </menu-item>
     </menu>