From 98e54d383c2e9c77c1ed7e2ec0d3f620e2562d35 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 17 Oct 2023 19:52:46 +0200 Subject: [PATCH] permissions --- .../robots/__pycache__/rex.cpython-39.pyc | Bin 3262 -> 3286 bytes groupTasks/libs/robots/rex.py | 4 ++-- modules/utils/globals.go | 14 ++++++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/groupTasks/libs/robots/__pycache__/rex.cpython-39.pyc b/groupTasks/libs/robots/__pycache__/rex.cpython-39.pyc index 707b9a68c299f79c58d0a968a814ae3c97ed7939..155119ca1865bc10fa43eca34f70f10fa5781cc6 100644 GIT binary patch delta 78 zcmdldc}7{Pp$UC2fk!kW;7DZ96W=2Ma63zu&DI5!dtQ3Y|22JkC gk69vxs>F)&lk!Uxit}?*74l0mQj0d5v39Tn02{d#lK=n! delta 59 zcmca6xlfWek(ZZ?0SIm_(Mw&kk#{}|BlG07EQ+F>&5Vo;C7cVmQaBa@St$&`44Pb% NAG1Vm4q!4+{VQ diff --git a/groupTasks/libs/robots/rex.py b/groupTasks/libs/robots/rex.py index c358af4..4fb8312 100644 --- a/groupTasks/libs/robots/rex.py +++ b/groupTasks/libs/robots/rex.py @@ -56,12 +56,12 @@ class Rex: print("robot offline") sys.exit(1) - if status != ResponseStatus.Error: + if status == ResponseStatus.Error: print("robot error") sys.exit(1) if status != ResponseStatus.Ok: - print("robot error") + print("robot some other error") sys.exit(1) def move_to_x(self, x): diff --git a/modules/utils/globals.go b/modules/utils/globals.go index 1e52169..0880515 100644 --- a/modules/utils/globals.go +++ b/modules/utils/globals.go @@ -205,7 +205,12 @@ const ( _consoles = "consoles." PermissionConsolesView = _consoles + "view" - PermissionRoboticsView = "robotics.view" + PermissionRoboticsRobotsView = "robotics.robots.view" + PermissionsRoboticsRobotsViewRobotsAddresses = "robotics.robots.view_robots_addresses" + PermissionsRoboticsRobotsEditRobotName = "robotics.robots.edit_robot_name" + PermissionsRoboticsRobotsDisconnectRobot = "robotics.robots.disconnect_robot" + PermissionsRoboticsRobotsEnablePermitJoin = "robotics.robots.enable_permit_join" + PermissionsRoboticsRobotsAuthorizeDenyUnauthorizedRobots = "robotics.robots.authorize_deny_unauthorized_robots" ) var SystemPermissions = []string{ @@ -230,7 +235,12 @@ var SystemPermissions = []string{ PermissionAdminAreaManageRemoveLogManagerServerConnection, PermissionUserProfileApiKeys, PermissionConsolesView, - PermissionRoboticsView, + PermissionRoboticsRobotsView, + PermissionsRoboticsRobotsViewRobotsAddresses, + PermissionsRoboticsRobotsEditRobotName, + PermissionsRoboticsRobotsDisconnectRobot, + PermissionsRoboticsRobotsEnablePermitJoin, + PermissionsRoboticsRobotsAuthorizeDenyUnauthorizedRobots, } var DynamicGroupTasksPermissions = []string{