This commit is contained in:
michael committed 2026-10-06 08:57:37 +02:00
1 parent e1456ed4ca
commit fc0dfd0556
3 files changed
+85 -23

No files matched your search

+1 -1
View File
@@ -1315,7 +1315,7 @@ export function App() {
setOpenTickets((items) => items.filter((item) => item.key !== ticket.key));
if (pathWithoutSearch(path) === pathWithoutSearch(ticket.path)) {
if (route.page === "ticket" && route.ticketId === ticket.ticketId) {
const returnPath = current.returnPath && pathWithoutSearch(current.returnPath) !== pathWithoutSearch(ticket.path) ? current.returnPath : "/analysis";
routerNavigate(returnPath);
}
+10 -2
View File
@@ -669,13 +669,21 @@ const preservedExistingPreviewChangeFields = new Set([
"TicketTracker-Zusammenführung"
]);
const informationalExistingPreviewChangeFields = new Set([
"Fremdes Ticket",
"Fremder Zammad-Owner",
"Hinweis"
]);
function preserveExistingPreviewChanges(item: ZammadSyncItem, changes: ZammadSyncChange[], fields: ZammadSyncExistingFields) {
const existingFields = new Set(changes.map((change) => change.field));
return [
const resultChanges = [
...item.changes.filter((change) => preservedExistingPreviewChangeFields.has(change.field) && !existingFields.has(change.field) && changeAllowedByFields(item, change, fields)),
...changes
];
return resultChanges.some((change) => !informationalExistingPreviewChangeFields.has(change.field)) ? resultChanges : [];
}
function changesFromExistingPreviewCache(item: ZammadSyncItem, fields: ZammadSyncExistingFields) {
@@ -737,7 +745,7 @@ function changesFromExistingPreviewCache(item: ZammadSyncItem, fields: ZammadSyn
const consultingProjectCanBeTouched = !mergeProtected && zammadWorkType === "consulting" && (fields.type || localWorkType === "consulting");
if (consultingProjectCanBeTouched) {
if (fields.type && !project) {
if (fields.type && localWorkType !== "consulting" && !project) {
changes.push({ field: "Projekt", from: null, to: "wird angelegt" });
}