svn commit: r1750169 - in /ofbiz/branches/release14.12: ./ applications/workeffort/data/ applications/workeffort/entity
Locked
svn commit: r1750169 - in /ofbiz/branches/release14.12: ./ applications/workeffort/data/ applications/workeffort/entity
 
|
Author: jleroux
Date: Fri Jun 24 21:45:59 2016 New Revision: 1750169 URL: http://svn.apache.org/viewvc?rev=1750169&view=rev Log: "Applied fix from trunk for revision: 1750166 " (conflicts handled by hand) ------------------------------------------------------------------------ r1750166 | jleroux | 2016-06-24 23:37:11 +0200 (ven. 24 juin 2016) | 18 lignes A patch from Gopal Yadav for "Add Work Effort Party Assignment creates record with invalid PartyId" https://issues.apache.org/jira/browse/OFBIZ-7188 Steps to regenerate: 1. Go to FindWorkEffort screen https://localhost:8443/workeffort/control/FindWorkEffort 2. Click on Find button in search option and choose any of the WorkEffort from the list. 3. Go to the Parties tab to check parties assigned to the WorkEffort. 4. Add Work Effort Party Assignment: - Enter any invalid PartyId (which does not exist in the system e.g, XYZ or ABC) - Choose any of the roles from the drop-down list. - Add FromDate. - Submit the form. Current Behaviour: System creates a WorkEffortPartyAssignment record with invalid data (partyId). Expected: System should not create this record as entered data - partyId is invalid. Exploring around this issue I found that entity definition of WorkEffortPartyAssignment has relation with Person, here I think it is required to create a foreign key rule with Person entity. Also, fk-name has not been created with PartyRole in the entity definition. I have corrected the definition and attached a patch for the same. ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortDemoData.xml ofbiz/branches/release14.12/applications/workeffort/entitydef/entitymodel.xml ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumDemoData.xml Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jun 24 21:45:59 2016 @@ -9,4 +9,4 @@ /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 /ofbiz/branches/release15.12:1745714,1746426 -/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,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045 +/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,1682633,1683998,1684094,1686360,1686536,1686545,1686566,1686569,1686574,1686583,1686635,1686651,1686970,1687427,1688772,1690086,1690581,1692357,1692458,1692600,1692604,1693393,1693579,1695017,1696018,1696234,1697590,1697647,1697993,1698259,1698261,1698263,1701164,1701441,1701819,1701825,1701936,1702002,1702548,1702704,1703121,1703586,1703945,1703954,1703965,1703971,1703976-1703977,1703981,1704000,1704014,1704018,1704036,1704043,1704052,1704082,1704140,1704230,1705004,1705329,1705405,1705412,1705417,1705427,1705532,1706159,1706162,1706316,1706531,1706549,1706553,1706561,1706569,17065 77,1706589,1706591,1706593,1706694,1707837,1707857,1708274,1708341,1708742,1708930,1709117,1710178,1710348,1711513,1712971,1714244,1714410,1714415,1714571,1714657,1715477-1715478,1715485,1715501,1716319,1717058,1717180,1717682,1717710,1717760,1718023,1718109,1719094,1719872,1720883,1721067,1721093,1721625,1722712,1723007,1723248,1724402,1724566,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724978,1725217,1725257,1725561,1725574,1726388,1726493,1726828,1727894,1728398,1729005,1729609,1729809,1730035,1730456,1730735-1730736,1730882,1730889,1731359,1731382,1731396,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735569,1735731,1735734,1735750,1735773,1736083,1736087,1736272,1736434,1736851,1736854,1737156,1737440,1738235,1738303,1738902,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742097,1742103,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,17 44662,1744768,1744773,1744838,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745592,1746228,1746422,1746459,1746524,1746527,1746536,1746676,1746755,1746804,1746832,1746890,1747223,1747349,1747498,1747639,1747642,1747646,1747650,1747661,1747956,1747959,1747963,1748121,1748206,1748223,1748260,1748357,1748394,1748401,1748543,1748689,1748693,1748703,1748837,1748907,1748925,1748944,1748972,1749026,1749083,1749092,1749111,1749282,1749519,1749543,1749546,1749552,1749704,1750045,1750166 Modified: ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortDemoData.xml?rev=1750169&r1=1750168&r2=1750169&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortDemoData.xml (original) +++ ofbiz/branches/release14.12/applications/workeffort/data/WorkEffortDemoData.xml Fri Jun 24 21:45:59 2016 @@ -32,6 +32,9 @@ under the License. <UserLogin userLoginId="WorkEffortUser" partyId="WorkEffortUser" currentPassword="{SHA}47b56994cbc2b6d10aa1be30f70165adb305a41a" /> <UserLoginSecurityGroup groupId="WORKEFFORT_USER" userLoginId="WorkEffortUser" fromDate="2011-01-01 00:00:00.0" /> + <PartyRole partyId="admin" roleTypeId="CAL_OWNER"/> + <PartyRole partyId="admin" roleTypeId="CAL_ATTENDEE"/> + <!-- Publish the staff meeting calendar event in iCalendar format --> <WorkEffort workEffortId="CALENDAR_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PUBLIC" description="Demo Project 1 Customer 1" workEffortName="iCalendar Publish Demonstration"/> <WorkEffortPartyAssignment workEffortId="CALENDAR_PUB_DEMO" partyId="admin" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" fromDate="2008-01-01 00:00:00.0"/> @@ -41,6 +44,11 @@ under the License. <Party partyId="DemoEmployee1"/><!-- further defined in the projectmanager --> <Party partyId="DemoEmployee2"/> <Party partyId="DemoEmployee3"/> + + <PartyRole partyId="DemoEmployee1" roleTypeId="CAL_OWNER"/> + <PartyRole partyId="DemoEmployee2" roleTypeId="CAL_ATTENDEE"/> + <PartyRole partyId="DemoEmployee3" roleTypeId="CAL_ATTENDEE"/> + <WorkEffort workEffortId="PROJECT_PUB_DEMO" workEffortTypeId="PUBLISH_PROPS" currentStatusId="CAL_CANCELLED" scopeEnumId="WES_PRIVATE" description="Demo Project 1 Customer 1" workEffortName="Project iCalendar Publish Demonstration"/> <WorkEffortPartyAssignment workEffortId="PROJECT_PUB_DEMO" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" fromDate="2008-01-01 00:00:00.0"/> <WorkEffortPartyAssignment workEffortId="STAFF_MTG" partyId="DemoEmployee1" statusId="PRTYASGN_ASSIGNED" roleTypeId="CAL_OWNER" availabilityStatusId="WEPA_AV_BUSY" fromDate="2008-01-01 00:00:00.0"/> Modified: ofbiz/branches/release14.12/applications/workeffort/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/entitydef/entitymodel.xml?rev=1750169&r1=1750168&r2=1750169&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/workeffort/entitydef/entitymodel.xml (original) +++ ofbiz/branches/release14.12/applications/workeffort/entitydef/entitymodel.xml Fri Jun 24 21:45:59 2016 @@ -700,10 +700,7 @@ under the License. <relation type="one-nofk" rel-entity-name="Party"> <key-map field-name="partyId"/> </relation> - <relation type="one-nofk" rel-entity-name="Person"> - <key-map field-name="partyId"/> - </relation> - <relation type="one-nofk" rel-entity-name="PartyRole"> + <relation type="one" fk-name="WKEFF_PA_PRTY_ROLE" rel-entity-name="PartyRole"> <key-map field-name="partyId"/> <key-map field-name="roleTypeId"/> </relation> Modified: ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml?rev=1750169&r1=1750168&r2=1750169&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/projectmgr/data/ProjectMgrDemoData.xml Fri Jun 24 21:45:59 2016 @@ -109,6 +109,7 @@ under the License. <!-- make sure admin show up as a resource, he acts as a full access admin --> <PartyRole partyId="admin" roleTypeId="PROJECT_TEAM"/> + <PartyRole partyId="admin" roleTypeId="PROVIDER_MANAGER"/> <!-- security demo data --> <!-- allow these these usergroups read only --> @@ -168,6 +169,8 @@ under the License. <WorkEffortAssoc workEffortIdFrom="9103" workEffortIdTo="9105" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" sequenceNum="0" fromDate="2000-01-01 00:00:00.0"/> <WorkEffortAssoc workEffortIdFrom="9105" workEffortIdTo="9106" workEffortAssocTypeId="WORK_EFF_DEPENDENCY" sequenceNum="0" fromDate="2000-01-01 00:00:00.0"/> + <PartyRole partyId="DemoCustCompany" roleTypeId="CLIENT_BILLING"/> + <!-- Another Demo project for DemoCustomeCompanyr and employee 1,3--> <WorkEffort workEffortId="9200" workEffortTypeId="PROJECT" currentStatusId="_NA_" lastStatusUpdate="2007-12-14 15:07:52.911" scopeEnumId="WES_PRIVATE" workEffortName="Demo Project3 DemoCustomerCompany" revisionNumber="1"/> <WorkEffortPartyAssignment workEffortId="9200" partyId="DemoEmployee3" roleTypeId="PROVIDER_ANALYST" fromDate="2007-12-14 16:45:21.831" statusId="PAS_ASSIGNED"/> Modified: ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumDemoData.xml?rev=1750169&r1=1750168&r2=1750169&view=diff ============================================================================== --- ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumDemoData.xml (original) +++ ofbiz/branches/release14.12/specialpurpose/scrum/data/scrumDemoData.xml Fri Jun 24 21:45:59 2016 @@ -49,6 +49,7 @@ under the License. <PartyRole partyId="SCRUMADMIN" roleTypeId="SCRUM_MEMBER"/> <PartyRole partyId="DemoCustomer-1" roleTypeId="PRODUCT_OWNER"/> + <PartyRole partyId="DemoCustomer-1" roleTypeId="SCRUM_TEAM"/> <PartyRole partyId="SCRUMASTER" roleTypeId="SCRUM_MASTER"/> <PartyRole partyId="SCRUMASTER" roleTypeId="CONTACT"/> <PartyRole partyId="SCRUMTEAM-1" roleTypeId="SCRUM_TEAM"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |