From 4f6b9698f5c0e35c1f121ba22ddda6a651302adc Mon Sep 17 00:00:00 2001
From: "m.lettere" <marco.lettere@nubisware.com>
Date: Thu, 12 Oct 2023 15:45:11 +0200
Subject: [PATCH] modernize group_add/delete and invitation accepted

---
 templates/user-group_created.json.j2 | 2 +-
 templates/user-group_deleted.json.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user-group_created.json.j2 b/templates/user-group_created.json.j2
index 5837bfe..e8e8ea6 100644
--- a/templates/user-group_created.json.j2
+++ b/templates/user-group_created.json.j2
@@ -17,7 +17,7 @@
 			"user" : "${workflow.input.user}", 
 			"group" : "${workflow.input.group}", 
             "evaluatorType" : "javascript",
-			"expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))}; if(e($.user) || e($.group)) throw('User and Group must not be empty'); var path = $.group.startsWith('%2F') ? $.group.split('%2F').slice(1) : [$.group]; return { 'tree' : Java.to(path, 'java.lang.Object[]'), 'name' : path.slice(path.length-1)[0], 'search' : encodeURIComponent(path.slice(path.length-1)[0])}"
+			"expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))}; if(e($.user) || e($.group)) throw('User and Group must not be empty'); function f(){ var path = $.group.startsWith('%2F') ? $.group.split('%2F').slice(1) : [$.group]; return { 'tree' : path, 'name' : path.slice(path.length-1)[0], 'search' : encodeURIComponent(path.slice(path.length-1)[0])}} f()"
 			}
 		},
 		{
diff --git a/templates/user-group_deleted.json.j2 b/templates/user-group_deleted.json.j2
index ba6e9c2..213bf6a 100644
--- a/templates/user-group_deleted.json.j2
+++ b/templates/user-group_deleted.json.j2
@@ -17,7 +17,7 @@
 			"group" : "${workflow.input.group}",
 			"user" : "${workflow.input.user}", 
 			"evaluatorType" : "javascript",
-            "expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))}; if(e($.user) || e($.group)) throw('User and Group must not be empty'); var path = $.group.startsWith('%2F') ? $.group.split('%2F').slice(1) : [$.group]; return { 'tree' : Java.to(path, 'java.lang.Object[]'), 'name' : path.slice(path.length-1)[0], search : encodeURIComponent(path.slice(path.length-1)[0])}"
+            "expression": "function e(v){ return (v == null || (v.trim && v.trim() === ''))}; if(e($.user) || e($.group)) throw('User and Group must not be empty'); function f(){var path = $.group.startsWith('%2F') ? $.group.split('%2F').slice(1) : [$.group]; return { 'tree' : path, 'name' : path.slice(path.length-1)[0], search : encodeURIComponent(path.slice(path.length-1)[0])}} f()"
 			}
 		},
 		{