Commit 4971e30174c5edf8aae67933f8819f393771f47f

Authored by Igor Kulikov
1 parent d18ca19b

Minor fixes

... ... @@ -317,6 +317,13 @@ public abstract class BaseController {
317 317 private void checkDashboard(Dashboard dashboard) throws ThingsboardException {
318 318 checkNotNull(dashboard);
319 319 checkTenantId(dashboard.getTenantId());
  320 + SecurityUser authUser = getCurrentUser();
  321 + if (authUser.getAuthority() == Authority.CUSTOMER_USER) {
  322 + if (dashboard.getCustomerId() == null || dashboard.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
  323 + throw new ThingsboardException("You don't have permission to perform this operation!",
  324 + ThingsboardErrorCode.PERMISSION_DENIED);
  325 + }
  326 + }
320 327 if (dashboard.getCustomerId() != null && !dashboard.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
321 328 checkCustomerId(dashboard.getCustomerId());
322 329 }
... ...
... ... @@ -23,7 +23,10 @@ export default function AppRun($rootScope, $window, $log, $state, $mdDialog, $fi
23 23 var unauthorizedDialog = null;
24 24 var forbiddenDialog = null;
25 25
  26 + $rootScope.iframeMode = false;
  27 +
26 28 if (frame) {
  29 + $rootScope.iframeMode = true;
27 30 var dataWidgetAttr = angular.element(frame).attr('data-widget');
28 31 if (dataWidgetAttr) {
29 32 $rootScope.editWidgetInfo = angular.fromJson(dataWidgetAttr);
... ...
... ... @@ -43,6 +43,7 @@ export default function DashboardController(types, widgetService, userService,
43 43 vm.rpcWidgetTypes = [];
44 44 vm.staticWidgetTypes = [];
45 45 vm.widgetEditMode = $state.$current.data.widgetEditMode;
  46 + vm.iframeMode = $rootScope.iframeMode;
46 47 vm.widgets = [];
47 48
48 49 vm.addWidget = addWidget;
... ...
... ... @@ -15,7 +15,7 @@
15 15 limitations under the License.
16 16
17 17 -->
18   -<md-content flex tb-expand-fullscreen="vm.widgetEditMode" hide-expand-button="vm.widgetEditMode">
  18 +<md-content flex tb-expand-fullscreen="vm.widgetEditMode || vm.iframeMode" hide-expand-button="vm.widgetEditMode || vm.iframeMode">
19 19 <!--section ng-show="!vm.isAddingWidget && !loading && !vm.widgetEditMode" layout="row" layout-wrap
20 20 class="tb-header-buttons tb-top-header-buttons md-fab" ng-style="{'right': '50px'}">
21 21 <md-button ng-if="vm.isTenantAdmin()" ng-show="vm.isEdit" ng-disabled="loading"
... ...