Made extension complete. There were some entries in the custom sectio…

…n that should have been in the module
hdijkema · Oct 23, 2020 · 511f6bf · 511f6bf
1 parent a3aeb94
commit 511f6bf
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 15 deletions.
diff --git a/application/Espo/Modules/Scripts/Resources/layouts/Script/detail.json b/application/Espo/Modules/Scripts/Resources/layouts/Script/detail.json
@@ -27,7 +27,7 @@
                     "name": "voorEntiteit"
                 },
                 {
-                    "name": "leden"
+                    "name": "contacts"
                 }
             ],
             [
@@ -48,7 +48,7 @@
         "style": "success",
         "dynamicLogicVisible": null,
         "hidden": false,
-        "customLabel": "Uitvoerbare taak"
+        "customLabel": "Executable Task"
     },
     {
         "rows": [
@@ -61,6 +61,6 @@
         "style": "info",
         "dynamicLogicVisible": null,
         "hidden": false,
-        "customLabel": "Verwerking"
+        "customLabel": "Executionlog"
     }
 ]
diff --git a/application/Espo/Modules/Scripts/Resources/layouts/Script/detailSmall.json b/application/Espo/Modules/Scripts/Resources/layouts/Script/detailSmall.json
@@ -27,7 +27,12 @@
                     "name": "voorEntiteit"
                 },
                 {
-                    "name": "leden"
+                    "name": "contacts"
+                }
+            ],
+            [
+                {
+                    "name": "emailTemplate"
                 }
             ],
             [
@@ -40,8 +45,10 @@
                 }
             ]
         ],
-        "style": "default",
-        "label": ""
+        "style": "success",
+        "dynamicLogicVisible": null,
+        "hidden": false,
+        "customLabel": "Executable task"
     },
     {
         "rows": [
@@ -54,6 +61,6 @@
         "style": "info",
         "dynamicLogicVisible": null,
         "hidden": true,
-        "customLabel": "Verslag"
+        "customLabel": "Executionlog"
     }
 ]
diff --git a/application/Espo/Modules/Scripts/Resources/metadata/clientDefs/Script.json b/application/Espo/Modules/Scripts/Resources/metadata/clientDefs/Script.json
@@ -12,13 +12,13 @@
     "iconClass": "fas fa-calculator",
     "dynamicLogic": {
         "fields": {
-            "leden": {
+            "contacts": {
                 "visible": {
                     "conditionGroup": [
                         {
                             "type": "equals",
                             "attribute": "voorEntiteit",
-                            "value": "Leden"
+                            "value": "Contacts"
                         }
                     ]
                 }
@@ -27,9 +27,19 @@
                 "visible": {
                     "conditionGroup": [
                         {
-                            "type": "equals",
-                            "attribute": "type",
-                            "value": "email"
+                            "type": "or",
+                            "value": [
+                                {
+                                    "type": "equals",
+                                    "attribute": "type",
+                                    "value": "email"
+                                },
+                                {
+                                    "type": "equals",
+                                    "attribute": "type",
+                                    "value": "job"
+                                }
+                            ]
                         }
                     ]
                 }

diff --git a/application/Espo/Modules/Scripts/Resources/metadata/entityDefs/Script.json b/application/Espo/Modules/Scripts/Resources/metadata/entityDefs/Script.json
@@ -84,7 +84,7 @@
             "default": "rapport",
             "isCustom": true
         },
-        "leden": {
+        "contacts": {
             "type": "linkMultiple",
             "layoutDetailDisabled": false,
             "layoutMassUpdateDisabled": false,
@@ -96,11 +96,11 @@
             "type": "enum",
             "required": true,
             "options": [
-                "Leden",
+                "Contacts",
                 "-"
             ],
             "style": {
-                "Leden": null,
+                "Contacts": null,
                 "-": null
             },
             "default": "-",