diff --git a/entity/Interest_entity/Interest_entity.aod b/entity/Interest_entity/Interest_entity.aod
index ae5bab0277d13b4a81797515c4c77593bfadb4bd..3f4e6912a4d8f3cccd90b2fbe1fb56e31904feff 100644
--- a/entity/Interest_entity/Interest_entity.aod
+++ b/entity/Interest_entity/Interest_entity.aod
@@ -3,6 +3,7 @@
<name>Interest_entity</name>
<title>Interest</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <grantDeleteProcess>%aditoprj%/entity/Interest_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Interest_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/Interest_entity/contentDescriptionProcess.js</contentDescriptionProcess>
<iconId>VAADIN:GAMEPAD</iconId>
@@ -64,6 +65,23 @@
<entityProvider>
<name>Interests</name>
</entityProvider>
+ <entityActionGroup>
+ <name>removeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>removeUsage</name>
+ <title>Delete all usage</title>
+ <onActionProcess>%aditoprj%/entity/Interest_entity/entityfields/removeactiongroup/children/removeusage/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <selectionType>MULTI</selectionType>
+ <iconId>NEON:TRASH</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>UsageCount_param</name>
+ <valueProcess>%aditoprj%/entity/Interest_entity/entityfields/usagecount_param/valueProcess.js</valueProcess>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Interest_entity/entityfields/removeactiongroup/children/removeusage/onActionProcess.js b/entity/Interest_entity/entityfields/removeactiongroup/children/removeusage/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ad2c9a1f1a75cad413575c7015f7d06c63e2db8c
--- /dev/null
+++ b/entity/Interest_entity/entityfields/removeactiongroup/children/removeusage/onActionProcess.js
@@ -0,0 +1,17 @@
+import("system.translate");
+import("system.question");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+var answer = question.askYesNo(translate.text("Confirmation dialog"), translate.withArguments("Do you really want to delete all usages of \"%0\"?", [translate.text(vars.get("$field.TITLE"))]), false);
+
+if (answer == true){
+ if (vars.get("$field.INTERESTID"))
+ {
+ newWhere("INTERESTLINK.INTEREST_ID", "$field.INTERESTID")
+ .deleteData(true, "INTERESTLINK");
+
+ question.showMessage(translate.withArguments("Deleted all usages of \"%0\".", [translate.text(vars.get("$field.TITLE"))]), question.INFORMATION, translate.text("Successful"));
+ }
+}
\ No newline at end of file
diff --git a/entity/Interest_entity/entityfields/usagecount_param/valueProcess.js b/entity/Interest_entity/entityfields/usagecount_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..579f5f6fff3174f12a869ce23a007033058b5627
--- /dev/null
+++ b/entity/Interest_entity/entityfields/usagecount_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.logging");
+import("Sql_lib");
+import("system.db");
+import("system.result");
+
+result.object(newSelect("count(*)")
+ .from("INTERESTLINK")
+ .whereIfSet("INTERESTLINK.INTEREST_ID", "$field.INTERESTID")
+ .cell(true, "0"));
\ No newline at end of file
diff --git a/entity/Interest_entity/grantDeleteProcess.js b/entity/Interest_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35df4eda41c77e7d651ace31178952bae6f2afa3
--- /dev/null
+++ b/entity/Interest_entity/grantDeleteProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.object(vars.get("$param.UsageCount_param") <= 0);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index c63f218a34d23eccf569932c20da2f1d0764a7e6..31a9db278e932e6813eeb1e9fe7be639fa32b5cf 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -9077,91 +9077,118 @@
<key>Turnover and Forecast</key>
</entry>
<entry>
- <key>The chosen attributes were successfully set for %0 %1</key>
+ <key>The function could not be deleted because it has links to other objects. The status of the function was set to inactive.</key>
</entry>
<entry>
- <key>SerialLetter</key>
+ <key>DSGVO - relevant attributes</key>
</entry>
<entry>
- <key>Bulkmail</key>
+ <key>DSGVO - mark + delete prozess</key>
</entry>
<entry>
- <key>%0 recipient will be added to the serial letter.</key>
+ <key>Is contact without a contract</key>
</entry>
<entry>
- <key>The attribute \"%0\" couldn't be set for %1 %2, because %3.</key>
+ <key>Move down</key>
</entry>
<entry>
- <key>the max amount of this attribute has been reached</key>
+ <key>Move selection up</key>
</entry>
<entry>
- <key>set attribute (use filter result)</key>
+ <key>BulkMail</key>
</entry>
<entry>
- <key>The chosen attribute was successfully set for %0 %1</key>
+ <key>Move up</key>
</entry>
<entry>
- <key>The function could not be deleted because it has links to other objects. The status of the function was set to inactive.</key>
+ <key>Move selection down</key>
</entry>
<entry>
- <key>Volume (Euro)</key>
+ <key>URL must be unique</key>
</entry>
<entry>
- <key>add Attributes</key>
+ <key>URL</key>
</entry>
<entry>
- <key>%0 recipient will be added to the bulk mail.</key>
+ <key>Redirect needs a full URL with http/https</key>
</entry>
<entry>
- <key>Attribute \"%0\" can only be inserted once with the same value.</key>
+ <key>Interest already assign to contact</key>
</entry>
<entry>
- <key>Set attribute (use filter result)</key>
+ <key>Interest already assigned to contact</key>
</entry>
<entry>
- <key>set attribute (selected data)</key>
+ <key>11</key>
</entry>
<entry>
- <key>affected rows:</key>
+ <key>12</key>
</entry>
<entry>
- <key>this attribute with the same value exists already</key>
+ <key>13</key>
</entry>
<entry>
- <key>DSGVO - relevant attributes</key>
+ <key>14</key>
</entry>
<entry>
- <key>DSGVO - mark + delete prozess</key>
+ <key>15</key>
</entry>
<entry>
- <key>Is contact without a contract</key>
+ <key>16</key>
</entry>
<entry>
- <key>Move down</key>
+ <key>17</key>
</entry>
<entry>
- <key>Move selection up</key>
+ <key>Add Attributes </key>
</entry>
<entry>
- <key>BulkMail</key>
+ <key>Autoresponder</key>
</entry>
<entry>
- <key>Move up</key>
+ <key>HTML</key>
</entry>
<entry>
- <key>Move selection down</key>
+ <key>Continue</key>
</entry>
<entry>
- <key>URL must be unique</key>
+ <key>Telefonkosten</key>
</entry>
<entry>
- <key>URL</key>
+ <key>HMMMM</key>
</entry>
<entry>
- <key>Redirect needs a full URL with http/https</key>
+ <key>3</key>
</entry>
<entry>
- <key>Interest already assign to contact</key>
+ <key>4</key>
+ </entry>
+ <entry>
+ <key>5</key>
+ </entry>
+ <entry>
+ <key>Bounced</key>
+ </entry>
+ <entry>
+ <key>6</key>
+ </entry>
+ <entry>
+ <key>7</key>
+ </entry>
+ <entry>
+ <key>8</key>
+ </entry>
+ <entry>
+ <key>9</key>
+ </entry>
+ <entry>
+ <key>GroupTest</key>
+ </entry>
+ <entry>
+ <key>10</key>
+ </entry>
+ <entry>
+ <key>Landingpage</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index d7c9c23a39fbd8308e4a7e996532116957eeb975..8bab2b97b116708837ff22f4a3ddbabf254f5122 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3310,6 +3310,10 @@
<key>Supplier</key>
<value>Lieferant</value>
</entry>
+ <entry>
+ <key>Confirmation dialog</key>
+ <value>Bestätigungsdialog</value>
+ </entry>
<entry>
<key>Nigeria</key>
<value>Nigeria</value>
@@ -3434,6 +3438,10 @@
<key>Micronesia (Federated States of)</key>
<value>Mikronesien (Föderierte Staaten von)</value>
</entry>
+ <entry>
+ <key>Do you really want to delete all usages of \"%0\"?</key>
+ <value>Möchtest du wirklich jede Verwendung von \"%0\" löschen?</value>
+ </entry>
<entry>
<key>Product_industry knowhow</key>
<value>Produkt_Branchen KnowHow</value>
@@ -11918,9 +11926,6 @@ Bitte Datumseingabe prüfen</value>
<key>The function could not be deleted because it has links to other objects. The status of the function was set to inactive.</key>
<value>Die Funktion konnte nicht gelöscht werden, da sie Verknüpfungen zu weiteren Objekten besitzt. Der Status der Funktion wurde auf Inaktiv gesetzt.</value>
</entry>
- <entry>
- <key>set attribute (use filter result)</key>
- </entry>
<entry>
<key>DSGVO - relevant attributes</key>
<value>DSGVO - Relevante Eigenschaften</value>
@@ -11936,6 +11941,81 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Bulkmail</key>
</entry>
+ <entry>
+ <key>Interest already assign to contact</key>
+ </entry>
+ <entry>
+ <key>11</key>
+ </entry>
+ <entry>
+ <key>12</key>
+ </entry>
+ <entry>
+ <key>13</key>
+ </entry>
+ <entry>
+ <key>14</key>
+ </entry>
+ <entry>
+ <key>15</key>
+ </entry>
+ <entry>
+ <key>16</key>
+ </entry>
+ <entry>
+ <key>17</key>
+ </entry>
+ <entry>
+ <key>Add Attributes </key>
+ </entry>
+ <entry>
+ <key>Autoresponder</key>
+ </entry>
+ <entry>
+ <key>HTML</key>
+ </entry>
+ <entry>
+ <key>Continue</key>
+ </entry>
+ <entry>
+ <key>Telefonkosten</key>
+ </entry>
+ <entry>
+ <key>HMMMM</key>
+ </entry>
+ <entry>
+ <key>3</key>
+ </entry>
+ <entry>
+ <key>4</key>
+ </entry>
+ <entry>
+ <key>5</key>
+ </entry>
+ <entry>
+ <key>Bounced</key>
+ </entry>
+ <entry>
+ <key>6</key>
+ </entry>
+ <entry>
+ <key>7</key>
+ </entry>
+ <entry>
+ <key>8</key>
+ </entry>
+ <entry>
+ <key>9</key>
+ </entry>
+ <entry>
+ <key>GroupTest</key>
+ </entry>
+ <entry>
+ <key>10</key>
+ </entry>
+ <entry>
+ <key>Landingpage</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 9b590bb2531967690a1831be21431097851d7d13..fb1fc7e2bf63cec250ad78a713db30ba71792bc3 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -9201,25 +9201,82 @@
<key>Redirect needs a full URL with http/https</key>
</entry>
<entry>
- <key>SerialLetter</key>
+ <key>Weighted(€)</key>
</entry>
<entry>
- <key>Bulkmail</key>
+ <key>Interest already assigned to contact</key>
</entry>
<entry>
- <key>%0 recipient will be added to the serial letter.</key>
+ <key>11</key>
</entry>
<entry>
- <key>Weighted(€)</key>
+ <key>12</key>
</entry>
<entry>
- <key>%0 recipient will be added to the bulk mail.</key>
+ <key>13</key>
</entry>
<entry>
- <key>Attribute \"%0\" can only be inserted once with the same value.</key>
+ <key>14</key>
</entry>
<entry>
- <key>Set attribute (use filter result)</key>
+ <key>15</key>
+ </entry>
+ <entry>
+ <key>16</key>
+ </entry>
+ <entry>
+ <key>17</key>
+ </entry>
+ <entry>
+ <key>Add Attributes </key>
+ </entry>
+ <entry>
+ <key>Autoresponder</key>
+ </entry>
+ <entry>
+ <key>HTML</key>
+ </entry>
+ <entry>
+ <key>Continue</key>
+ </entry>
+ <entry>
+ <key>Telefonkosten</key>
+ </entry>
+ <entry>
+ <key>HMMMM</key>
+ </entry>
+ <entry>
+ <key>3</key>
+ </entry>
+ <entry>
+ <key>4</key>
+ </entry>
+ <entry>
+ <key>5</key>
+ </entry>
+ <entry>
+ <key>Bounced</key>
+ </entry>
+ <entry>
+ <key>6</key>
+ </entry>
+ <entry>
+ <key>7</key>
+ </entry>
+ <entry>
+ <key>8</key>
+ </entry>
+ <entry>
+ <key>9</key>
+ </entry>
+ <entry>
+ <key>GroupTest</key>
+ </entry>
+ <entry>
+ <key>10</key>
+ </entry>
+ <entry>
+ <key>Landingpage</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonView/InterestFilter_view/InterestFilter_view.aod b/neonView/InterestFilter_view/InterestFilter_view.aod
index 93622b68cd8b1ea51eb20e82170d1c8d6de3f856..3b19d59f640c3e0894fd821917e16c3a9b59f6b1 100644
--- a/neonView/InterestFilter_view/InterestFilter_view.aod
+++ b/neonView/InterestFilter_view/InterestFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<tableViewTemplate>
<name>Table</name>
+ <favoriteActionGroup1>removeActionGroup</favoriteActionGroup1>
<columns>
<neonTableColumn>
<name>9300597d-e775-4f6e-908c-cdf5bcfa98e8</name>