From ae377e6c72cf3347a7400f67d967ee3439a3eeed Mon Sep 17 00:00:00 2001 From: =?utf8?q?D=C3=A9nes=20Horv=C3=A1th?= Date: Tue, 24 Sep 2019 12:45:30 +0000 Subject: [PATCH] Change of mediacube-auth.properties for mediacube.json, setting of visibility of elements depending on configuration settings git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31543 --- server/-configuration/mediacube.json | 14 +++- .../run-mediacube-server.launch | 4 +- .../pages/joblist.zul | 2 +- .../user.jobengine.osgi.server/pages/menu.zul | 4 +- .../pages/searchitems.zul | 4 +- .../zk/model/MediaCubeAuthentication.java | 18 ++--- .../jobengine/zk/util/LDAPUserHandler.java | 68 +++++++++---------- .../jobengine/zk/util/LocalUserHandler.java | 56 +++++++-------- .../user/jobengine/zk/util/SessionUtil.java | 50 ++++++++++++-- 9 files changed, 133 insertions(+), 87 deletions(-) diff --git a/server/-configuration/mediacube.json b/server/-configuration/mediacube.json index 4c07e5ba..427af377 100644 --- a/server/-configuration/mediacube.json +++ b/server/-configuration/mediacube.json @@ -41,9 +41,17 @@ "email" : "vasary@elgekko.net" } ], - "localAdmins": "root", - "localSubmitters": "lebony", - "localEditors": "editor" + "localAdmins": [ + "root", + "admin" + ], + "localSubmitters": [ + "lebony", + "xyz" + ], + "localEditors": [ + "editor" + ] } } diff --git a/server/-configuration/run-mediacube-server.launch b/server/-configuration/run-mediacube-server.launch index b801173e..6cb781e0 100644 --- a/server/-configuration/run-mediacube-server.launch +++ b/server/-configuration/run-mediacube-server.launch @@ -18,10 +18,10 @@ - + - + diff --git a/server/user.jobengine.osgi.server/pages/joblist.zul b/server/user.jobengine.osgi.server/pages/joblist.zul index a0a82f94..d2f43bef 100644 --- a/server/user.jobengine.osgi.server/pages/joblist.zul +++ b/server/user.jobengine.osgi.server/pages/joblist.zul @@ -23,7 +23,7 @@