From 8e9b2866f1f5eca50a4047f4b97da7e29e519ed2 Mon Sep 17 00:00:00 2001 From: Sebastian Pongratz <s.pongratz@adito.de> Date: Fri, 3 Apr 2020 12:23:19 +0000 Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?= =?UTF-8?q?=201054054][Leadimport-R=C3=BCckg=C3=A4ng-Aktion]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entity/Leadimport_entity/Leadimport_entity.aod | 1 + .../entityfields/leadimportreset/onActionProcess.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/entity/Leadimport_entity/Leadimport_entity.aod b/entity/Leadimport_entity/Leadimport_entity.aod index fde0eefd68..622a108ccd 100644 --- a/entity/Leadimport_entity/Leadimport_entity.aod +++ b/entity/Leadimport_entity/Leadimport_entity.aod @@ -343,6 +343,7 @@ <name>LeadimportReset</name> <title>Leadimport Reset</title> <onActionProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js</onActionProcess> + <iconId>VAADIN:ARROW_BACKWARD</iconId> <state>INVISIBLE</state> <stateProcess>%aditoprj%/entity/Leadimport_entity/entityfields/leadimportreset/stateProcess.js</stateProcess> </entityActionField> diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js index 65d82c07a2..4be4f4e2d4 100644 --- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js +++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js @@ -45,7 +45,7 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor) newSelect(pTableName + "." + pTableName + "ID") .from(pTableName) .join("LEADLOG", "LEADLOG.DATE_NEW = " + pTableName + ".DATE_NEW") - .where(pTableName + ".USER_NEW", "LEADLOG.USER_NEW") + .where(pTableName + ".USER_NEW = LEADLOG.USER_NEW") .and("LEADLOG.LEADIMPORT_ID", pleadimportId) .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(), "# >= ?"), SqlBuilder.IN()) .from(pTableName) -- GitLab