Commit 1dd815fe64d2c8f3f15a9e5c8f6cd115d2406863

Authored by Igor Kulikov
1 parent 2488154d

Minor fixes

@@ -118,7 +118,7 @@ public class EntityViewController extends BaseController { @@ -118,7 +118,7 @@ public class EntityViewController extends BaseController {
118 accessControlService 118 accessControlService
119 .checkPermission(getCurrentUser(), Resource.ENTITY_VIEW, Operation.CREATE, null, entityView); 119 .checkPermission(getCurrentUser(), Resource.ENTITY_VIEW, Operation.CREATE, null, entityView);
120 } else { 120 } else {
121 - EntityView existingEntityView = checkEntityViewId(entityView.getId(), Operation.READ); 121 + EntityView existingEntityView = checkEntityViewId(entityView.getId(), Operation.WRITE);
122 if (existingEntityView.getKeys() != null) { 122 if (existingEntityView.getKeys() != null) {
123 if (existingEntityView.getKeys().getAttributes() != null) { 123 if (existingEntityView.getKeys().getAttributes() != null) {
124 futures.add(deleteAttributesFromEntityView(existingEntityView, DataConstants.CLIENT_SCOPE, existingEntityView.getKeys().getAttributes().getCs(), getCurrentUser())); 124 futures.add(deleteAttributesFromEntityView(existingEntityView, DataConstants.CLIENT_SCOPE, existingEntityView.getKeys().getAttributes().getCs(), getCurrentUser()));
@@ -15,15 +15,6 @@ @@ -15,15 +15,6 @@
15 /// 15 ///
16 16
17 import { FunctionArg, FunctionArgType, TbEditorCompletions } from '@shared/models/ace/completion.models'; 17 import { FunctionArg, FunctionArgType, TbEditorCompletions } from '@shared/models/ace/completion.models';
18 -import {Asset} from "@shared/models/asset.models";  
19 -import {AttributeData} from "@shared/models/telemetry/telemetry.models";  
20 -import {BaseData} from "@shared/models/base-data";  
21 -import {EntityId} from "@shared/models/id/entity-id";  
22 -import {AliasFilterType, EntityAlias, EntityAliasFilterResult} from "@shared/models/alias.models";  
23 -import {Datasource} from "@shared/models/widget.models";  
24 -import {AliasInfo, StateParams} from "@core/api/widget-api.models";  
25 -import {ImportEntityData} from "@shared/models/entity.models";  
26 -  
27 18
28 export const entityIdHref = '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/id/entity-id.ts#L20">EntityId</a>'; 19 export const entityIdHref = '<a href="https://github.com/thingsboard/thingsboard/blob/13e6b10b7ab830e64d31b99614a9d95a1a25928a/ui-ngx/src/app/shared/models/id/entity-id.ts#L20">EntityId</a>';
29 20
@@ -101,7 +92,7 @@ export const importEntityDataHref = '<a href="https://github.com/thingsboard/thi @@ -101,7 +92,7 @@ export const importEntityDataHref = '<a href="https://github.com/thingsboard/thi
101 92
102 export const importEntitiesResultInfoHref = '<a href="https://github.com/thingsboard/thingsboard/blob/master/ui-ngx/src/app/shared/models/entity.models.ts#L42">Import entities result info</a>' 93 export const importEntitiesResultInfoHref = '<a href="https://github.com/thingsboard/thingsboard/blob/master/ui-ngx/src/app/shared/models/entity.models.ts#L42">Import entities result info</a>'
103 94
104 -export const customDialogComponentHref = '<a href="ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.component.ts:48">CustomDialogComponent</a>' 95 +export const customDialogComponentHref = '<a href="https://github.com/thingsboard/thingsboard/blob/master/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog.component.ts#L48">CustomDialogComponent</a>'
105 96
106 export const pageLinkArg: FunctionArg = { 97 export const pageLinkArg: FunctionArg = {
107 name: 'pageLink', 98 name: 'pageLink',
@@ -1219,7 +1210,7 @@ export const serviceCompletions: TbEditorCompletions = { @@ -1219,7 +1210,7 @@ export const serviceCompletions: TbEditorCompletions = {
1219 type:`Observable&lt;Array&lt;string&gt;&gt;`, 1210 type:`Observable&lt;Array&lt;string&gt;&gt;`,
1220 description:`An <code>Observable</code> of <code>string</code> variable.` 1211 description:`An <code>Observable</code> of <code>string</code> variable.`
1221 } 1212 }
1222 - //observableArrayReturnType('string') 1213 + // observableArrayReturnType('string')
1223 }, 1214 },
1224 createDatasourcesFromSubscriptionsInfo: { 1215 createDatasourcesFromSubscriptionsInfo: {
1225 description: 'Create database from subscriptions info', 1216 description: 'Create database from subscriptions info',
@@ -1291,7 +1282,7 @@ export const serviceCompletions: TbEditorCompletions = { @@ -1291,7 +1282,7 @@ export const serviceCompletions: TbEditorCompletions = {
1291 ], 1282 ],
1292 return:observableReturnTypeVariable('any') 1283 return:observableReturnTypeVariable('any')
1293 1284
1294 - //observableReturnType('any') 1285 + // observableReturnType('any')
1295 }, 1286 },
1296 } 1287 }
1297 }, 1288 },