svn commit: r1861871 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/party/template/party/profileblocks/ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ themes/rainbowstone/template/includes/

Author: jleroux
Date: Sat Jun 22 14:25:40 2019
New Revision: 1861871

URL: http://svn.apache.org/viewvc?rev=1861871&view=rev
Log:
"Applied fix from trunk for revision: 1861869"
------------------------------------------------------------------------
r1861869 | jleroux | 2019-06-22 16:19:09 +0200 (sam. 22 juin 2019) | 15 lignes

Fixed:
(OFBIZ-)

Logo image not displayed until we press in content component

Logo image was not showing on party profile page because we were using Ajax
request to add party content on the party profile screen.
So due to ajax request screen was not getting refreshed.

To display logo image we did the following changes:
1) Removed ajax request and rendered profile view screen after submit
2) Used ofbizUrl macro to show an image instead of /content/control/stream URL


Thanks: Moatasim Al Masri for reporting, Mohammed Rehan Khan for fixing
------------------------------------------------------------------------

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/profileblocks/Content.ftl
    ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
    ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/ProfileScreens.xml
    ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jun 22 14:25:40 2019
@@ -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,1819947,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,1826780,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,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859915,1859931,1859968,1859972,1859981,1860082,1860141,1860274,1860357,1860526,1860592,1860613,18607
 97,1861615,1861837,1861849,1861859
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1819947,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,1826780,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,1841662,1842372,1842921,1843225,1843893,1844943,1845418,1845420,1845466,1845544,1845552,1845558,1845933,1845995,1846097,1846107,1846214,1846594,1846632,1847398,1847478,1847670,1847715,
 1847890,1848263,1848336,1848386,1848398,1848441,1848444,1848447,1848449,1848467,1848469,1848745,1848849-1848850,1849021,1849165,1849191,1849193,1849275,1849467,1849528,1849540,1849567,1849693,1850015,1850023,1850530,1850647,1850685,1850694,1850914,1850918,1850948,1850953,1851006,1851068,1851074,1851130,1851158,1851163,1851200,1851247,1851319,1851350,1851805,1851998,1852587,1852818,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1855078,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856405,1856455,1856459-1856460,1856484,1856598,1856617,1856667,1857088,1857099,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858250,1858256,1858275,1858319,1858432,1858444,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800,1859807,1859871,1859877,1859882,1859915,1859931,1859968,1859972,1859981,1860082,1860141,1860274,1860357,1860526,1860592,1860613,18607
 97,1861615,1861837,1861849,1861859,1861869

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/profileblocks/Content.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/profileblocks/Content.ftl?rev=1861871&r1=1861870&r2=1861871&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/profileblocks/Content.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/party/template/party/profileblocks/Content.ftl Sat Jun 22 14:25:40 2019
@@ -54,16 +54,5 @@ under the License.
         </select>
         <input type="submit" value="${uiLabelMap.CommonUpload}" />
       </form>
-      <div id='progress_bar'><div></div></div>
     </div>
   </div>
-  <script type="text/javascript">
-    jQuery("#uploadPartyContent").validate({
-        submitHandler: function(form) {
-            <#-- call upload scripts - functions defined in PartyProfileContent.js -->
-            uploadPartyContent();
-            getUploadProgressStatus();
-            form.submit();
-        }
-    });
-  </script>

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1861871&r1=1861870&r2=1861871&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jun 22 14:25:40 2019
@@ -979,8 +979,8 @@ under the License.
     <request-map uri="uploadPartyContent">
         <security auth="true" https="true"/>
         <event type="service" invoke="uploadPartyContentFile"/>
-        <response name="success" type="view" value="partyContentList"/>
-        <response name="error" type="view" value="EventMessages"/>
+        <response name="success" type="view" value="viewprofile"/>
+        <response name="error" type="view" value="viewprofile"/>
     </request-map>
 
     <request-map uri="partyContentList">

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/ProfileScreens.xml?rev=1861871&r1=1861870&r2=1861871&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/party/widget/partymgr/ProfileScreens.xml Sat Jun 22 14:25:40 2019
@@ -44,7 +44,7 @@
                     <order-by field-name="-fromDate"/>
                 </entity-and>
                 <set field="partyContentId" from-field="partyContentList[0].contentId"/>
-                <set field="partyContent" value="${groovy: partyContentId!=null?'/content/control/stream?contentId=' + partyContentId + externalKeyParam : ''}"/>
+                <set field="partyContent" value="${groovy: partyContentId!=null?'/partymgr/control/stream?contentId=' + partyContentId + externalKeyParam : ''}"/>
                 <set field="partyGroupLogoLinkUrl" from-field="partyContent" default-value="${lookupGroup.logoImageUrl}" global="true"/>
                 <set field="personalImage" from-field="partyContent"/>
             </actions>

Modified: ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl?rev=1861871&r1=1861870&r2=1861871&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/themes/rainbowstone/template/includes/Avatar.ftl Sat Jun 22 14:25:40 2019
@@ -19,14 +19,14 @@ under the License.
 
 <div id="user-avatar" onclick="showHideUserPref()">
 <#if avatarDetail??>
-    <img src="/content/control/stream?contentId=${avatarDetail.contentId}" alt="user">
+    <img src="<@ofbizUrl>stream?contentId=${avatarDetail.contentId}</@ofbizUrl>" alt="user">
 <#else>
     <img src="/rainbowstone/images/avatar.svg" alt="user">
 </#if>
     <div id="user-details" style="display:none;">
         <div id="user-row1">
         <#if avatarDetail??>
-            <img src="/content/control/stream?contentId=${avatarDetail.contentId}" alt="user">
+            <img src="<@ofbizUrl>stream?contentId=${avatarDetail.contentId}</@ofbizUrl>" alt="user">
         <#else>
             <img src="/rainbowstone/images/avatar.svg" alt="user">
         </#if>