From 1e7e329947741ab4379c2f988c413cda3fb6cf35 Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Wed, 29 Jan 2025 16:08:16 -0400 Subject: [PATCH 1/2] Saving progress --- resources/js/components/AvatarImage.vue | 6 +++++- resources/js/components/shared/FilterTableBodyMixin.js | 6 ++++-- resources/js/processes/components/ProcessMixin.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/resources/js/components/AvatarImage.vue b/resources/js/components/AvatarImage.vue index 44aba66e31..b11a0399e8 100644 --- a/resources/js/components/AvatarImage.vue +++ b/resources/js/components/AvatarImage.vue @@ -45,7 +45,7 @@ {{ limitCharacters(value.name) }} - {{ $t('ProcessMaker') }} + {{ $t('ProcessMaker') }} {{ $t('Unclaimed') }} @@ -98,6 +98,10 @@ export default { usePmDefaultLabel: { type: Boolean, default: false, + }, + usePmDefaultLabelProcess: { + type: Boolean, + default: false, } }, data() { diff --git a/resources/js/components/shared/FilterTableBodyMixin.js b/resources/js/components/shared/FilterTableBodyMixin.js index 8a584bba20..11a47140c2 100644 --- a/resources/js/components/shared/FilterTableBodyMixin.js +++ b/resources/js/components/shared/FilterTableBodyMixin.js @@ -39,7 +39,8 @@ export default { this.perPage = value; this.fetch(); }, - formatAvatar(user, $usePmDefaultLabel = false) { + formatAvatar(user, $usePmDefaultLabel = false, $usePmDefaultLabelProcess = false) { + console.log("EN formatAvatar user",user, "usePmDefaultLabelProcess",$usePmDefaultLabelProcess); return { component: "AvatarImage", props: { @@ -47,7 +48,8 @@ export default { "input-data": user, "hide-name": false, "name-clickable": true, - 'use-pm-default-label': $usePmDefaultLabel + 'use-pm-default-label': $usePmDefaultLabel, + 'use-pm-default-label-process': $usePmDefaultLabelProcess }, }; }, diff --git a/resources/js/processes/components/ProcessMixin.js b/resources/js/processes/components/ProcessMixin.js index 33b8eb507e..dfe6620e3c 100644 --- a/resources/js/processes/components/ProcessMixin.js +++ b/resources/js/processes/components/ProcessMixin.js @@ -9,7 +9,7 @@ export default { for (const record of data.data) { // format Status - record.owner = this.formatAvatar(record.user); + record.owner = this.formatAvatar(record.user, false, true); record.category_list = this.formatCategory(record.categories); } return data; From f5b71047896726ca486971a5f5c2a92b75b8a40b Mon Sep 17 00:00:00 2001 From: CarliPinell Date: Thu, 30 Jan 2025 08:58:14 -0400 Subject: [PATCH 2/2] fix applied to ProcessMixin.js --- resources/js/components/shared/FilterTableBodyMixin.js | 1 - resources/js/processes/components/ProcessMixin.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/components/shared/FilterTableBodyMixin.js b/resources/js/components/shared/FilterTableBodyMixin.js index 11a47140c2..c7629d97d0 100644 --- a/resources/js/components/shared/FilterTableBodyMixin.js +++ b/resources/js/components/shared/FilterTableBodyMixin.js @@ -40,7 +40,6 @@ export default { this.fetch(); }, formatAvatar(user, $usePmDefaultLabel = false, $usePmDefaultLabelProcess = false) { - console.log("EN formatAvatar user",user, "usePmDefaultLabelProcess",$usePmDefaultLabelProcess); return { component: "AvatarImage", props: { diff --git a/resources/js/processes/components/ProcessMixin.js b/resources/js/processes/components/ProcessMixin.js index dfe6620e3c..51f75ab538 100644 --- a/resources/js/processes/components/ProcessMixin.js +++ b/resources/js/processes/components/ProcessMixin.js @@ -9,7 +9,8 @@ export default { for (const record of data.data) { // format Status - record.owner = this.formatAvatar(record.user, false, true); + const usePmDefaultLabelProcess = record.user === null; + record.owner = this.formatAvatar(record.user, false, usePmDefaultLabelProcess); record.category_list = this.formatCategory(record.categories); } return data;