Merge branch 'develop/2.5.1'

Igor Kulikov
2 parents 0f821815 0ef991c4
Showing 1 changed file with 1 additions and 6 deletions
application/src/main/java/org/thingsboard/server/controller/DashboardController.java
--- a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @60a601d
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
View file @60a601d
@@ -104,12 +104,7 @@ public class DashboardController extends BaseController {
         try {
             dashboard.setTenantId(getCurrentUser().getTenantId());
-            if (dashboard.getId() == null) {
-                accessControlService
-                        .checkPermission(getCurrentUser(), Resource.DASHBOARD, Operation.CREATE, dashboard.getId(), dashboard);
-            } else {
-                checkDashboardId(dashboard.getId(), Operation.WRITE);
-            }
+            checkEntity(dashboard.getId(), dashboard, Resource.DASHBOARD);
             Dashboard savedDashboard = checkNotNull(dashboardService.saveDashboard(dashboard));