diff --git a/resources/assets/js/admin/Modals/ModalPreview.vue b/resources/assets/js/admin/Modals/ModalPreview.vue
index 1013426a7..b08f2b58b 100644
--- a/resources/assets/js/admin/Modals/ModalPreview.vue
+++ b/resources/assets/js/admin/Modals/ModalPreview.vue
@@ -29,12 +29,7 @@
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -110,8 +105,7 @@ export default {
DRAFT: this.$i18n.t("ID_IN_DRAFT"),
PAUSED: this.$i18n.t("ID_PAUSED"),
UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
- },
- showUserTooltip: true
+ }
}
},
mounted() {
@@ -256,29 +250,31 @@ export default {
formatUser(data) {
var dataFormat = [],
userDataFormat;
- if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
- this.showUserTooltip = true;
- userDataFormat = utils.userNameDisplayFormat({
- userName: data.user_tooltip.usr_firstname,
- firstName: data.user_tooltip.usr_lastname,
- lastName: data.user_tooltip.usr_username,
- format: window.config.FORMATS.format || null
- });
- dataFormat.push({
- USERNAME_DISPLAY_FORMAT: userDataFormat,
- EMAIL: data.user_tooltip.usr_email,
- POSITION: data.user_tooltip.usr_position,
- AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
- window.config.SYS_URI +
- `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
- UNASSIGNED: userDataFormat !== "" ? true : false
- });
- } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
- this.showUserTooltip = false;
- dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
- } else {
- this.showUserTooltip = false;
- dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
+ switch (data.key_name) {
+ case 'user_tooltip':
+ userDataFormat = utils.userNameDisplayFormat({
+ userName: data.user_tooltip.usr_firstname,
+ firstName: data.user_tooltip.usr_lastname,
+ lastName: data.user_tooltip.usr_username,
+ format: window.config.FORMATS.format || null
+ });
+ dataFormat.push({
+ USERNAME_DISPLAY_FORMAT: userDataFormat,
+ EMAIL: data.user_tooltip.usr_email,
+ POSITION: data.user_tooltip.usr_position,
+ AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
+ window.config.SYS_URI +
+ `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
+ UNASSIGNED: userDataFormat !== "" ? true : false,
+ SHOW_TOOLTIP: true
+ });
+ break;
+ case 'dummy_task':
+ dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
+ break;
+ default:
+ dataFormat = "";
+ break;
}
return dataFormat;
}
diff --git a/resources/assets/js/components/vuetable/CurrentUserCell.vue b/resources/assets/js/components/vuetable/CurrentUserCell.vue
index e4fc4e264..0a64b14fc 100644
--- a/resources/assets/js/components/vuetable/CurrentUserCell.vue
+++ b/resources/assets/js/components/vuetable/CurrentUserCell.vue
@@ -1,5 +1,5 @@
-