svn commit: r1841658 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/datamodel/entitydef/content-entitymodel.xml

[surajk]

Author: surajk
Date: Sat Sep 22 07:16:02 2018
New Revision: 1841658

URL: http://svn.apache.org/viewvc?rev=1841658&view=rev
Log:
Applied fix from trunk for revision: 1841657
===

Fixed: Search operation on 'AssocRevisionItemView' entity causing exception.
(OFBIZ-8842)
Thanks Humera Khan for reporting the issue and providing the patch.

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/content-entitymodel.xml

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 22 07:16:02 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393,1823467,1823562,1823876,1824314,1824316,1824732,1824803,1824847,1824855,1825192,1825211,1825216,1825233,1825450,1826374,1826502,1826592,1826671,1826674,1826805,1826938,1826997,1827439,1828255,1828316,1828346,1828424,1828512,1828514,1829690,1830936,1831074,1831078,1831234,1831608,1831831,1832577,1832662,1832756,1832800,1832944,1833173,1833211,1834181,1834191,1834736,1835235,1835887,1835891,1835953,1835964,1836144,1836871,1837857,1838032,1838256,1838381,1840189,1840199,1840828,1841657

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/content-entitymodel.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/content-entitymodel.xml?rev=1841658&r1=1841657&r2=1841658&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/content-entitymodel.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/datamodel/entitydef/content-entitymodel.xml Sat Sep 22 07:16:02 2018
@@ -57,7 +57,7 @@ under the License.
       <alias entity-alias="CA" name="sequenceNum" group-by="true"/>
       <alias entity-alias="CRI" name="rootRevisionContentId" field="contentId" group-by="true"/>
       <alias entity-alias="CRI" name="itemContentId" group-by="true"/>
-      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="false"/>
+      <alias entity-alias="CRI" name="contentRevisionSeqId" group-by="true"/>
       <alias entity-alias="CRI" name="maxRevisionSeqId" field="contentRevisionSeqId" function="max"/>
       <view-link entity-alias="CA" rel-entity-alias="CRI">
         <key-map field-name="contentId" rel-field-name="itemContentId"/>