Re: svn commit: r1861869 - in /ofbiz/ofbiz-framework/trunk: applications/party/template/party/profileblocks/ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ themes/rainbowstone/template/includes/

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1861869 - in /ofbiz/ofbiz-framework/trunk: applications/party/template/party/profileblocks/ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ themes/rainbowstone/template/includes/

Suraj Khurana-2
Hello Jacques,

I think you need a svn propset here (Jira ticket Id).

--
Best Regards,
Suraj Khurana
Technical Consultant







On Sat, Jun 22, 2019 at 7:49 PM <[hidden email]> wrote:

> Author: jleroux
> Date: Sat Jun 22 14:19:09 2019
> New Revision: 1861869
>
> URL: http://svn.apache.org/viewvc?rev=1861869&view=rev
> Log:
> 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/trunk/applications/party/template/party/profileblocks/Content.ftl
>
> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>
> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>
> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>
> Modified:
> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl?rev=1861869&r1=1861868&r2=1861869&view=diff
>
> ==============================================================================
> ---
> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
> (original)
> +++
> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
> Sat Jun 22 14:19:09 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="application/javascript">
> -    jQuery("#uploadPartyContent").validate({
> -        submitHandler: function(form) {
> -            <#-- call upload scripts - functions defined in
> PartyProfileContent.js -->
> -            uploadPartyContent();
> -            getUploadProgressStatus();
> -            form.submit();
> -        }
> -    });
> -  </script>
> +  </div>
> \ No newline at end of file
>
> Modified:
> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1861869&r1=1861868&r2=1861869&view=diff
>
> ==============================================================================
> ---
> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
> (original)
> +++
> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
> Sat Jun 22 14:19:09 2019
> @@ -990,8 +990,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/trunk/applications/party/widget/partymgr/ProfileScreens.xml
> URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1861869&r1=1861868&r2=1861869&view=diff
>
> ==============================================================================
> ---
> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
> (original)
> +++
> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
> Sat Jun 22 14:19:09 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/trunk/themes/rainbowstone/template/includes/Avatar.ftl
> URL:
> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl?rev=1861869&r1=1861868&r2=1861869&view=diff
>
> ==============================================================================
> ---
> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
> (original)
> +++
> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
> Sat Jun 22 14:19:09 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>
>
>
>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1861869 - in /ofbiz/ofbiz-framework/trunk: applications/party/template/party/profileblocks/ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ themes/rainbowstone/template/includes/

Jacques Le Roux
Administrator
Oops indeed, thanks Suraj, the C/P somehow failed :/

Le 22/06/2019 à 18:10, Suraj Khurana a écrit :

> Hello Jacques,
>
> I think you need a svn propset here (Jira ticket Id).
>
> --
> Best Regards,
> Suraj Khurana
> Technical Consultant
>
>
>
>
>
>
>
> On Sat, Jun 22, 2019 at 7:49 PM <[hidden email]> wrote:
>
>> Author: jleroux
>> Date: Sat Jun 22 14:19:09 2019
>> New Revision: 1861869
>>
>> URL: http://svn.apache.org/viewvc?rev=1861869&view=rev
>> Log:
>> 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/trunk/applications/party/template/party/profileblocks/Content.ftl
>>
>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>>
>> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>>
>> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>>
>> Modified:
>> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl?rev=1861869&r1=1861868&r2=1861869&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
>> (original)
>> +++
>> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
>> Sat Jun 22 14:19:09 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="application/javascript">
>> -    jQuery("#uploadPartyContent").validate({
>> -        submitHandler: function(form) {
>> -            <#-- call upload scripts - functions defined in
>> PartyProfileContent.js -->
>> -            uploadPartyContent();
>> -            getUploadProgressStatus();
>> -            form.submit();
>> -        }
>> -    });
>> -  </script>
>> +  </div>
>> \ No newline at end of file
>>
>> Modified:
>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1861869&r1=1861868&r2=1861869&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>> (original)
>> +++
>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>> Sat Jun 22 14:19:09 2019
>> @@ -990,8 +990,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/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1861869&r1=1861868&r2=1861869&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>> (original)
>> +++
>> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>> Sat Jun 22 14:19:09 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/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>> URL:
>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl?rev=1861869&r1=1861868&r2=1861869&view=diff
>>
>> ==============================================================================
>> ---
>> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>> (original)
>> +++
>> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>> Sat Jun 22 14:19:09 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>
>>
>>
>>
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r1861869 - in /ofbiz/ofbiz-framework/trunk: applications/party/template/party/profileblocks/ applications/party/webapp/partymgr/WEB-INF/ applications/party/widget/partymgr/ themes/rainbowstone/template/includes/

Jacques Le Roux
Administrator
Fixed with title in Jira too

Le 22/06/2019 à 22:07, Jacques Le Roux a écrit :

> Oops indeed, thanks Suraj, the C/P somehow failed :/
>
> Le 22/06/2019 à 18:10, Suraj Khurana a écrit :
>> Hello Jacques,
>>
>> I think you need a svn propset here (Jira ticket Id).
>>
>> --
>> Best Regards,
>> Suraj Khurana
>> Technical Consultant
>>
>>
>>
>>
>>
>>
>>
>> On Sat, Jun 22, 2019 at 7:49 PM <[hidden email]> wrote:
>>
>>> Author: jleroux
>>> Date: Sat Jun 22 14:19:09 2019
>>> New Revision: 1861869
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1861869&view=rev
>>> Log:
>>> 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/trunk/applications/party/template/party/profileblocks/Content.ftl
>>>
>>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>>>
>>> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>>>
>>> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl?rev=1861869&r1=1861868&r2=1861869&view=diff 
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
>>> (original)
>>> +++
>>> ofbiz/ofbiz-framework/trunk/applications/party/template/party/profileblocks/Content.ftl
>>> Sat Jun 22 14:19:09 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="application/javascript">
>>> -    jQuery("#uploadPartyContent").validate({
>>> -        submitHandler: function(form) {
>>> -            <#-- call upload scripts - functions defined in
>>> PartyProfileContent.js -->
>>> -            uploadPartyContent();
>>> -            getUploadProgressStatus();
>>> -            form.submit();
>>> -        }
>>> -    });
>>> -  </script>
>>> +  </div>
>>> \ No newline at end of file
>>>
>>> Modified:
>>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1861869&r1=1861868&r2=1861869&view=diff 
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>>> (original)
>>> +++
>>> ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
>>> Sat Jun 22 14:19:09 2019
>>> @@ -990,8 +990,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/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml?rev=1861869&r1=1861868&r2=1861869&view=diff 
>>>
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>>> (original)
>>> +++
>>> ofbiz/ofbiz-framework/trunk/applications/party/widget/partymgr/ProfileScreens.xml
>>> Sat Jun 22 14:19:09 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/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>>> URL:
>>> http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl?rev=1861869&r1=1861868&r2=1861869&view=diff
>>>
>>> ==============================================================================
>>> ---
>>> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>>> (original)
>>> +++
>>> ofbiz/ofbiz-framework/trunk/themes/rainbowstone/template/includes/Avatar.ftl
>>> Sat Jun 22 14:19:09 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>
>>>
>>>
>>>
>