test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: show subject in email content

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-25 21:56:10 +05:30
parent a751b2d3e9
commit 04633880cf
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/components/Activities.vue
View File

@ -383,14 +383,27 @@
</Button>
</div>
</div>
<div class="text-sm leading-5 text-gray-600">
{{ activity.data.subject }}
</div>
<div class="mb-3 text-sm leading-5 text-gray-600">
<span class="mr-1">TO:</span>
<span class="mr-1 text-2xs font-bold text-gray-500">TO:</span>
<span>{{ activity.data.recipients }}</span>
<span v-if="activity.data.cc">, </span>
<span v-if="activity.data.cc" class="mr-1">CC:</span>
<span
v-if="activity.data.cc"
class="mr-1 text-2xs font-bold text-gray-500"
>
CC:
</span>
<span v-if="activity.data.cc">{{ activity.data.cc }}</span>
<span v-if="activity.data.bcc">, </span>
<span v-if="activity.data.bcc" class="mr-1">BCC:</span>
<span
v-if="activity.data.bcc"
class="mr-1 text-2xs font-bold text-gray-500"
>
BCC:
</span>
<span v-if="activity.data.bcc">{{ activity.data.bcc }}</span>
</div>
<span class="prose-f" v-html="activity.data.content" />
@ -405,7 +418,9 @@
</div>
</div>
<div class="mb-4" v-else-if="activity.activity_type == 'comment'">
<div class="mb-0.5 py-1.5 flex items-start justify-stretch gap-2 text-base">
<div
class="mb-0.5 flex items-start justify-stretch gap-2 py-1.5 text-base"
>
<div class="inline-flex flex-wrap gap-1 text-gray-600">
<span class="font-medium text-gray-800">
{{ activity.owner_name }}

8
frontend/src/components/Controls/MultiselectInput.vue
View File

@ -195,14 +195,18 @@ const addValue = (value) => {
value = value.trim()
if (value) {
// check if value is not already in the values array
if (!values.value.includes(value)) {
if (!values.value?.includes(value)) {
// check if value is valid
if (value && props.validate && !props.validate(value)) {
error.value = props.errorMessage(value)
return
}
// add value to values array
values.value.push(value)
if (!values.value) {
values.value = [value]
} else {
values.value.push(value)
}
value = value.replace(value, '')
}
}