diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 8e78193ff5ea2723e1e42b72512e6fc7cfe3d41f..ff4967936f7fb5d3392fe4536b14527374c64e66 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -4,6 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
<title>Attribute</title>
+ <grantDeleteProcess>%aditoprj%/entity/Attribute_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Attribute_entity/contentTitleProcess.js</contentTitleProcess>
<afterUiInit>%aditoprj%/entity/Attribute_entity/afterUiInit.js</afterUiInit>
<onValidation>%aditoprj%/entity/Attribute_entity/onValidation.js</onValidation>
diff --git a/entity/Attribute_entity/grantDeleteProcess.js b/entity/Attribute_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0eb2801843da24787bd3d53d81465cf4cdf8cfd7
--- /dev/null
+++ b/entity/Attribute_entity/grantDeleteProcess.js
@@ -0,0 +1,18 @@
+import("system.result");
+import("Attribute_lib");
+import("system.vars");
+import("Sql_lib");
+import("Entity_lib");
+
+var attributeId = vars.get("$field.UID");
+
+var childCountSql = newSelect("count(*)")
+ .from("AB_ATTRIBUTE")
+ .where("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", attributeId);
+
+var canDelete = new HasLinkedObjectTester()
+ .andSqlYieldsZero(childCountSql)
+ .and(function () {return !AttributeUtil.hasRelations(attributeId);})
+ .validate();
+
+result.string(canDelete);
\ No newline at end of file
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index ca9331355b1030eca6a28166522a70d87e1fd6a0..dd20915b9f3a31053421416f69e276e664a507e2 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -363,7 +363,6 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<isFilterable v="true" />
- <isRequireContainerFiltering v="true" />
<isSortable v="true" />
<contentProcess>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
diff --git a/entity/Employee_entity/grantDeleteProcess.js b/entity/Employee_entity/grantDeleteProcess.js
index d817b2a09effbf52d467ced477cffc4f62d4e29d..86fbbf98ab20a6f8ca6988c92e306b87f1f9d495 100644
--- a/entity/Employee_entity/grantDeleteProcess.js
+++ b/entity/Employee_entity/grantDeleteProcess.js
@@ -1,17 +1,17 @@
+import("Entity_lib");
import("Employee_lib");
import("Document_lib");
import("system.vars");
import("system.result");
-var res = false;
+var userTitle = vars.get("$field.TITLE");
+var userId = vars.get("$field.UID");
+var contactId = vars.get("$field.CONTACT_ID");
-//the current user should not delete himself
-if (EmployeeUtils.getCurrentUserName() != vars.get("$field.TITLE")
- && !EmployeeUtils.hasRelations(vars.get("$field.CONTACT_ID"))
- && !DocumentUtil.hasDocuments("EMPLOYEE", null, EmployeeUtils.sliceUserId(vars.get("$field.UID")))
- )
-{
- res = true;
-}
+var canDelete = new HasLinkedObjectTester()
+ .and(function () {return EmployeeUtils.getCurrentUserName() != userTitle;})
+ .and(function () {return !EmployeeUtils.hasRelations(contactId);})
+ .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "EMPLOYEE", AssignmentRowId_param : userId})
+ .validate();
-result.string(res);
\ No newline at end of file
+result.string(canDelete);
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 78bae2c27e11814875466e02b79032ce7acf4ef2..3bb0d751e45d6c5da96bf74ed78b129e66531930 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("Sql_lib");
import("system.db");
import("Attribute_lib");
@@ -8,7 +7,7 @@ import("system.tools");
import("Util_lib");
import("Contact_lib");
import("JditoFilter_lib");
-import("Employee_lib");attrib
+import("Employee_lib");
var users;
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -68,15 +67,19 @@ var filterFns = {
{
if (pOperator == "CONTAINS")
{
- return pRow.some(function (fieldValue)
+ pRow = [pRow[1], pRow[3], pRow[4], pRow[5]];
+ var filterValues = pFilterValue.split(" ").filter(function (val) {return val.trim();});
+ return filterValues.every(function (filterValue)
{
- return (new RegExp(pFilterValue, "i")).test(fieldValue);
+ return pRow.some(function (fieldValue)
+ {
+ return (new RegExp(filterValue, "i")).test(fieldValue);
+ });
});
}
return false;
}
};
-logging.log(JSON.stringify(filter, null, "\t"))
users = JditoFilterUtils.filterRecords(filterFields, users, filter.filter, filterFns);
users.forEach(function (user) {user[12] = "";}); //clean up the ROLE_FILTER field, we don't need it after filtering
diff --git a/entity/Organisation_entity/grantDeleteProcess.js b/entity/Organisation_entity/grantDeleteProcess.js
index 4a66f91d61493a7007f86421cf7c7b23b1657796..ac422599415ae93687f01ffd10c9e38c43fce4b1 100644
--- a/entity/Organisation_entity/grantDeleteProcess.js
+++ b/entity/Organisation_entity/grantDeleteProcess.js
@@ -15,6 +15,7 @@ var canDelete = new HasLinkedObjectTester()
.andNoEntityRows("Salesproject_entity", "Salesprojects", {ContactId_param : contactId}) //Salesprojects
.andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
.andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
+ .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId]), ObjectTypes_param : JSON.stringify([currentContext])}) //ObjectTrees
.validate();
result.string(canDelete);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index 8ee5af70d3b5bff479cd64e4e16db0fb2542d6ee..1467c8c8def81ca779b7d6aac7ad28ce33e95371 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("Context_lib");
import("Workflow_lib");
import("system.vars");
@@ -11,5 +12,9 @@ DuplicateScannerUtils.DeleteCachedDuplicate(contactId);
new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
.deleteAllAttributes();
+newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
+newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
+newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+
//WorkflowStarter.deleted();
//WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Person_entity/grantDeleteProcess.js b/entity/Person_entity/grantDeleteProcess.js
index 3bda71caca1d80154d27be56e8bdccd7e1c593af..7b130d228f43287df7b16ee2f16acc9f7f43c009 100644
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
@@ -14,6 +14,7 @@ var canDelete = new HasLinkedObjectTester()
.and(function () {return !EmployeeUtils.isUser(contactId);})
.andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
.andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
+ .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
.validate();
result.string(canDelete);
diff --git a/entity/Person_entity/recordcontainers/db/onDBDelete.js b/entity/Person_entity/recordcontainers/db/onDBDelete.js
index 85ede0d4e7b00eff43445e5906725a325ef1cedd..5f8eff3e5bf26f8b6337498aecd79d0e0ae6277c 100644
--- a/entity/Person_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Person_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("Context_lib");
import("Attribute_lib");
import("Workflow_lib");
@@ -10,5 +11,9 @@ DuplicateScannerUtils.DeleteCachedDuplicate(contactId);
new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
.deleteAllAttributes();
+newWhere("COMMUNICATION.CONTACT_ID", contactId).deleteData();
+newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
+newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
+
//WorkflowStarter.deleted();
//WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/Salesproject_entity/grantDeleteProcess.js b/entity/Salesproject_entity/grantDeleteProcess.js
index 308efbc9c6f88d322faf3e9afe977797b093804f..9115dfca2096d5a4e5b45146ea49baed6f3f1ca1 100644
--- a/entity/Salesproject_entity/grantDeleteProcess.js
+++ b/entity/Salesproject_entity/grantDeleteProcess.js
@@ -10,6 +10,7 @@ var canDelete = new HasLinkedObjectTester()
.andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
.andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : rowId}) //Tasks
.andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "SALESPROJECT", AssignmentRowId_param : rowId}) //Documents
+ .andNoEntityRows("Timetracking_entity", "Timetrackings", {ObjectId_param : currentContext, RowId_param : rowId}) //Timetrackings
.validate();
result.string(canDelete);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index bdeb6b5340b8ac62e3f9330b5a14367ee687593e..93d6a35c5e750fe267191156246999d9049d9129 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -39,8 +39,6 @@ if (currentId)
db.deletes(toDelete);
-
-// TODO: auch Dokumente, Aktivitäten, Aufgaben, Zeiterfassungen löschen?
}
new AttributeRelationQuery(currentId, null, ContextUtils.getCurrentContextId())
diff --git a/process/Entity_lib/process.js b/process/Entity_lib/process.js
index 2bc9919a0b54b3dc00b228c61094ef163fa8de54..2e00cc8b9f1b726bab18bca4603751b12ec94c4d 100644
--- a/process/Entity_lib/process.js
+++ b/process/Entity_lib/process.js
@@ -3,6 +3,7 @@ import("system.entities");
import("system.result");
import("system.neon");
import("system.vars");
+import("Sql_lib");
/**
* provides static methods for special handling of entities in JDito-Processes
@@ -237,6 +238,15 @@ HasLinkedObjectTester._testForCallback = function ()
: fnResult;
}
+/**
+ * @ignore
+ */
+HasLinkedObjectTester._testForSqlCount = function ()
+{
+ //also works for empty string because Number("") returns 0
+ return Number(this.sqlQuery.cell()) === 0;
+}
+
/**
* !!! YOU CAN'T USE THIS FUNCTION YET !!!
*
@@ -301,6 +311,25 @@ HasLinkedObjectTester.prototype.and = function (pCallbackFn, pFailValue)
return this;
}
+/**
+ * Adds a SqlBuilder object to the validation that should return a single number (e. g. "select count(*) ..."). If the result of the SQL is not 0,
+ * the overall validation will return false.
+ *
+ * @param {SqlBuilder} pSqlQuery the SqlBuilder object, the SQL will be executed with SqlBuilder.prototype.cell() and is expected to result in a number
+ * @return {HasLinkedObjectTester} current object
+ */
+HasLinkedObjectTester.prototype.andSqlYieldsZero = function (pSqlQuery)
+{
+ if (!(pSqlQuery instanceof SqlBuilder))
+ throw new TypeError(translate.text("pSqlQuery must be of type SqlBuilder"));
+
+ this._validationObjects.push({
+ checkForObjects : HasLinkedObjectTester._testForSqlCount,
+ sqlQuery : pSqlQuery
+ });
+ return this;
+}
+
/**
* Executes the validation of all tests that have been added to the object. If every test returns true, the result will also be true,
* but if any test returns false, the execution will stop and false is returned.