diff --git a/resources/assets/js/components/vuetable/CurrentUserCell.vue b/resources/assets/js/components/vuetable/CurrentUserCell.vue index 86f9ea2ad..3d6b94bd7 100644 --- a/resources/assets/js/components/vuetable/CurrentUserCell.vue +++ b/resources/assets/js/components/vuetable/CurrentUserCell.vue @@ -6,6 +6,7 @@ variant="info" :src="item.AVATAR" size="2em" + v-show="item.UNASSIGNED" > diff --git a/resources/assets/js/home/AdvancedSearch.vue b/resources/assets/js/home/AdvancedSearch.vue index 588f25c4d..9811275bd 100644 --- a/resources/assets/js/home/AdvancedSearch.vue +++ b/resources/assets/js/home/AdvancedSearch.vue @@ -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; diff --git a/resources/assets/js/utils/utils.js b/resources/assets/js/utils/utils.js index 3b42aad92..0651f365f 100644 --- a/resources/assets/js/utils/utils.js +++ b/resources/assets/js/utils/utils.js @@ -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