From 2ffd88a4dc6322ea620bdf0e21fa795799ed5159 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Fri, 3 Dec 2021 15:27:28 +0100
Subject: [PATCH] [Projekt: xRM-ContactManagement][TicketNr.:
2002126][Releasefinalisierung]
---
.../recordcontainers/db/onDBUpdate.js | 25 +++++++++++--------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
index 2bacab3ce0..74b2fd4af9 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
@@ -38,9 +38,9 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
if (vars.get("$field.INBOX_ID"))
{
var mailsig = newSelect("MAILSIGNATURE.MAILSIGNATUREID")
- .from("MAILSIGNATURE")
- .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID"))
- .cell();
+ .from("MAILSIGNATURE")
+ .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID"))
+ .cell();
TicketfieldValues["MAILSIGNATURE_ID"] = mailsig;
}
@@ -51,7 +51,6 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
if ( (actionName == "sendTicketBackAction") || (actionName == "changeStatusAfterForwardEmail"))
{
newWhereIfSet("TICKET.TICKETID", vars.get("field.TICKETID")).updateFields(TicketfieldValues);
- neon.openHome();
}
///RESUBMIT TICKETS
else if( actionName == "resubmitTicket")
@@ -66,16 +65,16 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
"directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
"subject" : translate.text("Ticket resubmitted"),
"content" : translate.text("New date due") + ": "
- + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy") + " "
- + translate.text("Editor changed to") + ": "
- + ContactUtils.getFullTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"),false),
+ + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy") + " "
+ + translate.text("Editor changed to") + ": "
+ + ContactUtils.getFullTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"),false),
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys(),
"responsibleContactId" : EmployeeUtils.getCurrentContactId()
}
var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID];
ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
- // end ACTIVITY
+ // end ACTIVITY
}
///RETURN TICKETS
@@ -88,7 +87,7 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
"directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
"subject" : translate.text("Ticket returned"),
"content" : translate.text("Ticket returned to pool") + ". "
- +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue"),
+ +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue"),
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys(),
"responsibleContactId" : EmployeeUtils.getCurrentContactId()
}
@@ -103,8 +102,12 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
TicketfieldValues["INBOX_ID"] = vars.get("$field.INBOX_ID");
TicketfieldValues["CATEGORY"] = vars.get("$field.TICKETCATEGORY");
}
- newWhere("TICKET.TICKETID","$field.TICKETID").updateFields(TicketfieldValues);
- newWhere("TASK.TASKID", "$field.TASK_ID").updateFields(TaskfieldValues);
+ if ( (actionName != "sendTicketBackAction") || (actionName != "changeStatusAfterForwardEmail"))
+ {
+ newWhere("TICKET.TICKETID","$field.TICKETID").updateFields(TicketfieldValues);
+ newWhere("TASK.TASKID", "$field.TASK_ID").updateFields(TaskfieldValues);
+ }
+
}
WorkflowSignalSender.updated();
\ No newline at end of file
--
GitLab