Skip to content
Snippets Groups Projects
Commit 4e11160b authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Obsolete todo comments removed

parent 63f45896
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 76 additions and 99 deletions
entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -5,5 +5,4 @@ import("Sql_lib");
var cond = newWhereIfSet("ACTIVITYLINK.ACTIVITY_ID", "$param.ActivityId_param", SqlBuilder.EQUAL());
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/Activity_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -59,5 +59,4 @@ if (Utils.toBoolean(vars.get("$param.OnlyInnate_param")))
condition.andIfSet("ACTIVITY.PARENT_ID", "$param.ParentId_param");
condition.andIfSet("ACTIVITY.PARENT_CONTEXT", "$param.ParentContext_param");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(condition.toString());
\ No newline at end of file
entity/AddressType_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -18,5 +18,4 @@ if (usageFilter)
SqlBuilder.IN())
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 73
− 73
View file @ 4e11160b
......@@ -90,14 +90,6 @@
<entityProvider>
<name>OrganisationAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
<entityName>Organisation_entity</entityName>
<fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
......@@ -118,6 +110,14 @@
<expose v="false" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
<entityName>Organisation_entity</entityName>
<fieldName>Addresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>ContactId_param</name>
......@@ -128,20 +128,6 @@
<entityProvider>
<name>ContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
<entityName>Person_entity</entityName>
<fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
<entityName>Contact_entity</entityName>
<fieldName>ContactAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
......@@ -162,6 +148,20 @@
<expose v="false" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
<entityName>Person_entity</entityName>
<fieldName>PersAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
<entityName>Contact_entity</entityName>
<fieldName>ContactAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityProvider>
<name>#PROVIDER</name>
......@@ -178,14 +178,6 @@
<name>OrganisationAddressesByContact</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
<titlePlural>Company Addresses</titlePlural>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
<entityName>Person_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>ContactType_param</name>
......@@ -198,6 +190,14 @@
<expose v="false" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
<entityName>Person_entity</entityName>
<fieldName>OrgAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityField>
<name>IS_STANDARD</name>
......@@ -223,26 +223,6 @@
<entityProvider>
<name>OrganisationAndContactAddresses</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/documentation.adoc</documentation>
<dependencies>
<entityDependency>
<name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
<entityName>Person_entity</entityName>
<fieldName>ContactAndOrganisationAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
<entityName>Offer_entity</entityName>
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>2f162626-bd99-4e2a-b9cf-e95864d9ed0e</name>
<entityName>Order_entity</entityName>
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
<name>DefaultAddressId_param</name>
......@@ -264,6 +244,26 @@
<expose v="true" />
</entityParameter>
</children>
<dependencies>
<entityDependency>
<name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
<entityName>Person_entity</entityName>
<fieldName>ContactAndOrganisationAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
<entityName>Offer_entity</entityName>
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>2f162626-bd99-4e2a-b9cf-e95864d9ed0e</name>
<entityName>Order_entity</entityName>
<fieldName>PossibleAddresses</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityParameter>
<name>OrganisationId_param</name>
......@@ -272,17 +272,17 @@
</entityParameter>
<entityConsumer>
<name>KeywordAddressTypes</name>
<dependency>
<name>dependency</name>
<entityName>AddressType_entity</entityName>
<fieldName>ByCategory</fieldName>
</dependency>
<children>
<entityParameter>
<name>UsageFilter_param</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AddressType_entity</entityName>
<fieldName>ByCategory</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
......@@ -309,11 +309,6 @@
</entityField>
<entityConsumer>
<name>ZipValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>ZipValidaton</fieldName>
</dependency>
<children>
<entityParameter>
<name>Country_param</name>
......@@ -324,14 +319,14 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>CityValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>CityValidation</fieldName>
<fieldName>ZipValidaton</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>CityValidation</name>
<children>
<entityParameter>
<name>CurrentValue_param</name>
......@@ -342,6 +337,11 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>CityValidation</fieldName>
</dependency>
</entityConsumer>
<entityField>
<name>AddressSearch</name>
......@@ -357,11 +357,6 @@
</entityField>
<entityConsumer>
<name>FullAddressValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>FullAddressValidation</fieldName>
</dependency>
<children>
<entityParameter>
<name>CurrentValue_param</name>
......@@ -372,14 +367,14 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>StreetValidation</name>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>StreetValidation</fieldName>
<fieldName>FullAddressValidation</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>StreetValidation</name>
<children>
<entityParameter>
<name>City_param</name>
......@@ -394,6 +389,11 @@
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/streetvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
<dependency>
<name>dependency</name>
<entityName>AddressValidation_entity</entityName>
<fieldName>StreetValidation</fieldName>
</dependency>
</entityConsumer>
<entityParameter>
<name>ShowDsgvoMessage_param</name>
......
entity/Address_entity/recordcontainers/db/conditionProcess.js
+ 2
− 7
View file @ 4e11160b
......@@ -4,13 +4,9 @@ import("system.db");
import("Sql_lib");
var cond = newWhere()
.andIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param");
if (vars.exists("$param.ContactId_param")) // Todo: shouldn't be needed, but sometimes in the filter view of pers / org the param doesn't exist?? --> It should be null if it's not set...
cond.andIfSet("ADDRESS.CONTACT_ID", "$param.ContactId_param");
if (vars.exists("$param.OrganisationId_param")) // Todo: shouldn't be needed, but sometimes in the filter view of pers / org the param doesn't exist??' --> It should be null if it's not set...
var organisationId = vars.get("$param.OrganisationId_param");
var organisationId = vars.get("$param.OrganisationId_param");
if (organisationId)
{
var organisationContactId = newSelect("CONTACT.CONTACTID")
......@@ -21,5 +17,4 @@ if (organisationId)
cond.orIfSet("ADDRESS.CONTACT_ID", organisationContactId);
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/AnyContact_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -32,5 +32,4 @@ var contactIds = vars.exists("$param.ContactIds_param") && vars.get("$param.Cont
if (contactIds)
cond.andIfSet("CONTACT.CONTACTID", JSON.parse(contactIds), SqlBuilder.IN());
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/AppointmentLink_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -4,5 +4,4 @@ import("Sql_lib");
var cond = newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", "$param.AppointmentId_param")
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -2,6 +2,5 @@ import("Sql_lib");
import("system.db");
import("system.result");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(newWhereIfSet("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", "$param.AttributeId_param")
.toString());
entity/BulkMailRecipient_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -2,5 +2,4 @@ import("system.db");
import("system.result");
import("Sql_lib");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(newWhere("BULKMAILRECIPIENT.BULKMAIL_ID", "$param.BulkMailId_param").toString());
\ No newline at end of file
entity/CampaignCost_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -19,5 +19,4 @@ else
cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is null");
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
+ 1
− 2
View file @ 4e11160b
......@@ -13,6 +13,5 @@ if(sysSelection.length > 0) //selektierte IDs als Array
}
else
{
let sysFilter = vars.get("$sys.filter");//todo change name
CampaignUtils.openSetCampaignStepViewByCondition(JSON.stringify(sysFilter), campaignId, campaignStepId);
CampaignUtils.openSetCampaignStepViewByCondition(JSON.stringify(vars.get("$sys.filter")), campaignId, campaignStepId);
}
\ No newline at end of file
entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -6,5 +6,4 @@ import("system.result");
var cond = newWhereIfSet("CAMPAIGNSTEP.CAMPAIGN_ID", "$param.campaignId_param")
.andIfSet("CAMPAIGNSTEP.SORTING","$param.maxSort_param", SqlBuilder.LESS_OR_EQUAL());
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/ClassificationGroup_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -16,5 +16,4 @@ if (objectType)
.from("CLASSIFICATIONTYPE")
.where("CLASSIFICATIONTYPE.OBJECT_TYPE", objectType), SqlBuilder.IN());
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -3,5 +3,4 @@ import("Sql_lib");
import("system.db");
import("system.result");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(newWhereIfSet("CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID", "$param.ClassificationTypeId_param").toString());
\ No newline at end of file
entity/CommRestriction_Entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -4,5 +4,4 @@ import("Sql_lib");
var cond = newWhereIfSet("COMMRESTRICTION.CONTACT_ID", "$param.ContactId_param");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/Communication_entity/entityfields/addr/contentTypeProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -4,7 +4,6 @@ import("system.vars");
import("system.result");
import("system.neon");
//TODO: add constants for contentTypes #1022547
var medium = vars.get("$field.MEDIUM_ID");
var contentType;
if (medium)
......
entity/Communication_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -13,5 +13,4 @@ if (vars.getString("$param.CommMediumIds_param"))
var mediumIds = JSON.parse(vars.getString("$param.CommMediumIds_param"));
cond.andIfSet("COMMUNICATION.MEDIUM_ID", mediumIds, SqlBuilder.IN());
}
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/Competition_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -6,5 +6,4 @@ var cond = newWhere()
.andIfSet("COMPETITION.OBJECT_ROWID", "$param.ObjectRowId_param")
.andIfSet("COMPETITION.OBJECT_TYPE", "$param.ObjectType_param");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
entity/Contact_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -7,5 +7,4 @@ var cond = newWhere()
.andIfSet("CONTACT.CONTACTID", "$param.OwnContactId_param", SqlBuilder.NOT_EQUAL())
.andIfSet("CONTACT.PERSON_ID", "$param.PersonId_param");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
\ No newline at end of file
entity/Contract_entity/recordcontainers/db/conditionProcess.js
+ 0
− 1
View file @ 4e11160b
......@@ -5,5 +5,4 @@ import("Sql_lib");
var cond = newWhereIfSet("CONTRACT.CONTACT_ID", "$param.ContactId_param");
//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
result.string(cond.toString());
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment