This commit is contained in:
2023-05-10 18:52:31 +00:00
parent 02213102a2
commit 134386520a
2 changed files with 12 additions and 8 deletions

View File

@@ -457,7 +457,9 @@
color="blue darken-1" color="blue darken-1"
text text
:disabled=" :disabled="
subject == null || message == null || obj.emailAddress == null subject == null ||
message == null ||
optionsObj.emailAddress == null
" "
@click="sendEmail()" @click="sendEmail()"
>{{ $ay.t("OK") }}</v-btn >{{ $ay.t("OK") }}</v-btn
@@ -638,7 +640,7 @@ export default {
this.obj.id == 0 || this.obj.id == 0 ||
this.subject == null || this.subject == null ||
this.message == null || this.message == null ||
window.$gz.util.stringIsNullOrEmpty(this.obj.emailAddress) window.$gz.util.stringIsNullOrEmpty(this.optionsObj.emailAddress)
) { ) {
return; return;
} }
@@ -647,7 +649,7 @@ export default {
const res = await window.$gz.api.upsert("notify/direct-smtp", { const res = await window.$gz.api.upsert("notify/direct-smtp", {
ObjectId: this.obj.id, ObjectId: this.obj.id,
aType: this.ayaType, aType: this.ayaType,
toAddress: this.obj.emailAddress, toAddress: this.optionsObj.emailAddress,
subject: this.subject, subject: this.subject,
textBody: this.message textBody: this.message
}); });
@@ -1127,7 +1129,7 @@ function generateMenu(vm) {
if ( if (
vm.rights.change && vm.rights.change &&
vm.$route.params.recordid != 0 && vm.$route.params.recordid != 0 &&
!window.$gz.util.stringIsNullOrEmpty(vm.obj.emailAddress) !window.$gz.util.stringIsNullOrEmpty(vm.optionsObj.emailAddress)
) { ) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "SendEmail", title: "SendEmail",

View File

@@ -448,7 +448,9 @@
color="blue darken-1" color="blue darken-1"
text text
:disabled=" :disabled="
subject == null || message == null || obj.emailAddress == null subject == null ||
message == null ||
optionsObj.emailAddress == null
" "
@click="sendEmail()" @click="sendEmail()"
>{{ $ay.t("OK") }}</v-btn >{{ $ay.t("OK") }}</v-btn
@@ -641,7 +643,7 @@ export default {
this.obj.id == 0 || this.obj.id == 0 ||
this.subject == null || this.subject == null ||
this.message == null || this.message == null ||
window.$gz.util.stringIsNullOrEmpty(this.obj.emailAddress) window.$gz.util.stringIsNullOrEmpty(this.optionsObj.emailAddress)
) { ) {
return; return;
} }
@@ -650,7 +652,7 @@ export default {
const res = await window.$gz.api.upsert("notify/direct-smtp", { const res = await window.$gz.api.upsert("notify/direct-smtp", {
ObjectId: this.obj.id, ObjectId: this.obj.id,
aType: this.ayaType, aType: this.ayaType,
toAddress: this.obj.emailAddress, toAddress: this.optionsObj.emailAddress,
subject: this.subject, subject: this.subject,
textBody: this.message textBody: this.message
}); });
@@ -1084,7 +1086,7 @@ function generateMenu(vm) {
if ( if (
vm.rights.change && vm.rights.change &&
vm.$route.params.recordid != 0 && vm.$route.params.recordid != 0 &&
!window.$gz.util.stringIsNullOrEmpty(vm.obj.emailAddress) !window.$gz.util.stringIsNullOrEmpty(vm.optionsObj.emailAddress)
) { ) {
menuOptions.menuItems.push({ menuOptions.menuItems.push({
title: "SendEmail", title: "SendEmail",