From dd0c84ecb4567c4ed2ae4520433de454420f67ec Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 20 Nov 2019 15:20:51 +0530
Subject: [PATCH] Fixes #1186 Uer image display in edit-view
---
.../v7/modules/Users/PreferenceDetailViewHeader.tpl | 2 +-
layouts/v7/modules/Users/UserViewHeader.tpl | 2 +-
layouts/v7/modules/Vtiger/RecentActivities.tpl | 12 ++++++------
layouts/v7/modules/Vtiger/partials/Topbar.tpl | 4 ++--
.../v7/modules/Vtiger/uitypes/ImageDetailView.tpl | 4 ++--
.../PBXManager/templates/DetailViewHeaderTitle.tpl | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl b/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl
index 3c6173ce5..d9a79561b 100644
--- a/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl
+++ b/layouts/v7/modules/Users/PreferenceDetailViewHeader.tpl
@@ -18,7 +18,7 @@
<div class="col-xs-8">
{assign var=IMAGE_DETAILS value=$RECORD->getImageDetails()}
{foreach key=ITER item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.url) && !empty($IMAGE_INFO.orgname)}
+ {if !empty($IMAGE_INFO.url)}
<span class="logo col-xs-2">
<img height="75px" width="75px" src="{$IMAGE_INFO.url}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}">
</span>
diff --git a/layouts/v7/modules/Users/UserViewHeader.tpl b/layouts/v7/modules/Users/UserViewHeader.tpl
index 0e4b62665..754487eb3 100644
--- a/layouts/v7/modules/Users/UserViewHeader.tpl
+++ b/layouts/v7/modules/Users/UserViewHeader.tpl
@@ -18,7 +18,7 @@
<div class="col-md-5 recordImage" style="height: 50px;width: 50px;">
{assign var=NOIMAGE value=0}
{foreach key=ITER item=IMAGE_INFO from=$RECORD->getImageDetails()}
- {if !empty($IMAGE_INFO.url) && !empty($IMAGE_INFO.orgname)}
+ {if !empty($IMAGE_INFO.url)}
<img height="100%" width="100%" src="{$IMAGE_INFO.url}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" data-image-id="{$IMAGE_INFO.id}">
{else}
{assign var=NOIMAGE value=1}
diff --git a/layouts/v7/modules/Vtiger/RecentActivities.tpl b/layouts/v7/modules/Vtiger/RecentActivities.tpl
index 0da6885c3..1aaf9ecc4 100644
--- a/layouts/v7/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/v7/modules/Vtiger/RecentActivities.tpl
@@ -31,15 +31,15 @@
</time>
{assign var=USER_MODEL value=$RECENT_ACTIVITY->getModifiedBy()}
{assign var=IMAGE_DETAILS value=$USER_MODEL->getImageDetails()}
- {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].path eq ''}
+ {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].url eq ''}
<div class="update_icon bg-info">
<i class='update_image vicon-vtigeruser'></i>
</div>
{else}
{foreach item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
+ {if !empty($IMAGE_INFO.url)}
<div class="update_icon">
- <img class="update_image" src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" >
+ <img class="update_image" src="{$IMAGE_INFO.url}" >
</div>
{/if}
{/foreach}
@@ -59,15 +59,15 @@
</time>
{assign var=USER_MODEL value=$RECENT_ACTIVITY->getModifiedBy()}
{assign var=IMAGE_DETAILS value=$USER_MODEL->getImageDetails()}
- {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].path eq ''}
+ {if $IMAGE_DETAILS neq '' && $IMAGE_DETAILS[0] neq '' && $IMAGE_DETAILS[0].url eq ''}
<div class="update_icon bg-info">
<i class='update_image vicon-vtigeruser'></i>
</div>
{else}
{foreach item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
+ {if !empty($IMAGE_INFO.url)}
<div class="update_icon">
- <img class="update_image" src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" >
+ <img class="update_image" src="{$IMAGE_INFO.url}" >
</div>
{/if}
{/foreach}
diff --git a/layouts/v7/modules/Vtiger/partials/Topbar.tpl b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
index 70d819200..9cdd3ae0e 100644
--- a/layouts/v7/modules/Vtiger/partials/Topbar.tpl
+++ b/layouts/v7/modules/Vtiger/partials/Topbar.tpl
@@ -155,8 +155,8 @@
<i class='vicon-vtigeruser' style="font-size:90px"></i>
{else}
{foreach item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
- <img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" width="100px" height="100px">
+ {if !empty($IMAGE_INFO.url)}
+ <img src="{$IMAGE_INFO.url}" width="100px" height="100px">
{/if}
{/foreach}
{/if}
diff --git a/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl b/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl
index 9fc6de202..a5ca411b8 100644
--- a/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl
+++ b/layouts/v7/modules/Vtiger/uitypes/ImageDetailView.tpl
@@ -10,7 +10,7 @@
********************************************************************************/
-->*}
{foreach key=ITER item=IMAGE_INFO from=$RECORD->getImageDetails()}
- {if !empty($IMAGE_INFO.path) && !empty({$IMAGE_INFO.orgname})}
- <img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" width="150" height="80">
+ {if !empty($IMAGE_INFO.url)}
+ <img src="{$IMAGE_INFO.url}" width="150" height="80">
{/if}
{/foreach}
\ No newline at end of file
diff --git a/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl b/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl
index 6b45a82f0..16648e775 100644
--- a/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl
+++ b/pkg/vtiger/modules/PBXManager/templates/DetailViewHeaderTitle.tpl
@@ -18,8 +18,8 @@
{assign var=IMAGE_DETAILS value=$MODULE_INSTANCE->getImageDetails()}
{if $IMAGE_DETAILS}
{foreach key=ITER item=IMAGE_INFO from=$IMAGE_DETAILS}
- {if !empty($IMAGE_INFO.path)}
- <img src="{$IMAGE_INFO.path}_{$IMAGE_INFO.orgname}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" >
+ {if !empty($IMAGE_INFO.url)}
+ <img src="{$IMAGE_INFO.url}" alt="{$IMAGE_INFO.orgname}" title="{$IMAGE_INFO.orgname}" >
{else}
<img src="{vimage_path('summary_Contact.png')}" class="summaryImg"/>
{/if}
--
GitLab