Browse Source
Merge pull request #12772 from irynamatveieva/calculated-fields
Calculated fields:removed resource
pull/12791/head
Andrew Shvayka
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
1 additions and
4 deletions
-
application/src/main/java/org/thingsboard/server/service/security/permission/Resource.java
-
application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
|
|
|
@ -50,9 +50,7 @@ public enum Resource { |
|
|
|
VERSION_CONTROL, |
|
|
|
NOTIFICATION(EntityType.NOTIFICATION_TARGET, EntityType.NOTIFICATION_TEMPLATE, |
|
|
|
EntityType.NOTIFICATION_REQUEST, EntityType.NOTIFICATION_RULE), |
|
|
|
MOBILE_APP_SETTINGS, |
|
|
|
CALCULATED_FIELD(EntityType.CALCULATED_FIELD), |
|
|
|
CALCULATED_FIELD_LINK(EntityType.CALCULATED_FIELD_LINK); |
|
|
|
MOBILE_APP_SETTINGS; |
|
|
|
|
|
|
|
private final Set<EntityType> entityTypes; |
|
|
|
|
|
|
|
|
|
|
|
@ -55,7 +55,6 @@ public class TenantAdminPermissions extends AbstractPermissions { |
|
|
|
put(Resource.OAUTH2_CONFIGURATION_TEMPLATE, new PermissionChecker.GenericPermissionChecker(Operation.READ)); |
|
|
|
put(Resource.MOBILE_APP, tenantEntityPermissionChecker); |
|
|
|
put(Resource.MOBILE_APP_BUNDLE, tenantEntityPermissionChecker); |
|
|
|
put(Resource.CALCULATED_FIELD, tenantEntityPermissionChecker); |
|
|
|
} |
|
|
|
|
|
|
|
public static final PermissionChecker tenantEntityPermissionChecker = new PermissionChecker() { |
|
|
|
|
