fernando/luos
1
0
Fork 0
Code Releases Activity

PMCORE-2781:Issues with Current user when is a Unassigned case from advanced search

Browse Source
This commit is contained in:
fabio
2021-01-26 11:41:09 -04:00
parent 812f84dc36
commit f8f4197818
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/vuetable/CurrentUserCell.vue
View File

@@ -6,6 +6,7 @@
variant="info"
:src="item.AVATAR"
size="2em"
v-show="item.UNASSIGNED"
></b-avatar>
</div>
<b-popover
@@ -20,6 +21,7 @@
variant="info"
:src="item.AVATAR"
size="4em"
v-show="item.UNASSIGNED"
></b-avatar>
</b-col>
<b-col md="9">

15
resources/assets/js/home/AdvancedSearch.vue
View File

@@ -270,20 +270,23 @@ export default {
},
formatUser(data) {
var i,
dataFormat = [];
dataFormat = [],
userDataFormat;
for (i = 0; i < data.length; i += 1) {
dataFormat.push({
USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({
userDataFormat = utils.userNameDisplayFormat({
userName: data[i].usr_firstname,
firstName: data[i].usr_lastname,
lastName: data[i].usr_username,
format: window.config.FORMATS.format || null
}),
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat !== "" ? userDataFormat : this.$i18n.t("ID_UNASSIGNED"),
EMAIL: data[i].user_tooltip.usr_email,
POSITION: data[i].user_tooltip.usr_position,
AVATAR: window.config.SYS_SERVER +
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data[i].user_id}`
`users/users_ViewPhotoGrid?pUID=${data[i].user_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
}
return dataFormat;

2
resources/assets/js/utils/utils.js
View File

@@ -17,7 +17,7 @@ export default {
aux = aux.replace('@userName',defaultValues.userName);
aux = aux.replace('@firstName',defaultValues.firstName);
aux = aux.replace('@lastName',defaultValues.lastName);
return aux;
return aux.trim();
},
/**
* Parse an url string and prepare an object of the parameters