dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added buttons to entities' cards for edge scope except Dashboards

Browse Source
This commit is contained in:
deaflynx 2020-12-09 13:29:20 +02:00
parent a79b7678ee
commit 2c360f5221
12 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/app/asset/asset-fieldset.tpl.html
View File

@ -27,6 +27,9 @@
<md-button ng-click="onDeleteAsset({event: $event})"
ng-show="!isEdit && assetScope === 'tenant'"
class="md-raised md-primary">{{ 'asset.delete' | translate }}</md-button>
<md-button ng-click="onUnassignFromEdge({event: $event})"
ng-show="!isEdit && assetScope === 'edge'"
class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
<div layout="row">
<md-button ngclipboard data-clipboard-action="copy"

1
ui/src/app/asset/asset.controller.js
View File

@ -130,6 +130,7 @@ export function AssetController($rootScope, userService, assetService, customerS
vm.assignToCustomer = assignToCustomer;
vm.makePublic = makePublic;
vm.unassignFromCustomer = unassignFromCustomer;
vm.unassignFromEdge = unassignFromEdge;
initController();

3
ui/src/app/asset/asset.directive.js
View File

@ -66,7 +66,8 @@ export default function AssetDirective($compile, $templateCache, toast, $transla
onAssignToCustomer: '&',
onMakePublic: '&',
onUnassignFromCustomer: '&',
onDeleteAsset: '&'
onDeleteAsset: '&',
onUnassignFromEdge: '&'
}
};
}

1
ui/src/app/asset/assets.tpl.html
View File

@ -29,6 +29,7 @@
on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])"
on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)"
on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
on-delete-asset="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-asset>
</md-tab>
<md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}">

3
ui/src/app/device/device-fieldset.tpl.html
View File

@ -24,6 +24,9 @@
<md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})"
ng-show="!isEdit && (deviceScope === 'customer' || deviceScope === 'tenant') && isAssignedToCustomer"
class="md-raised md-primary">{{ isPublic ? 'device.make-private' : 'device.unassign-from-customer' | translate }}</md-button>
<md-button ng-click="onUnassignFromEdge({event: $event})"
ng-show="!isEdit && deviceScope === 'edge'"
class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
<md-button ng-click="onManageCredentials({event: $event})"
ng-show="!isEdit"
class="md-raised md-primary">{{ (deviceScope === 'customer_user' ? 'device.view-credentials' : 'device.manage-credentials') | translate }}</md-button>

1
ui/src/app/device/device.controller.js
View File

@ -131,6 +131,7 @@ export function DeviceController($rootScope, userService, deviceService, custome
vm.makePublic = makePublic;
vm.unassignFromCustomer = unassignFromCustomer;
vm.manageCredentials = manageCredentials;
vm.unassignFromEdge = unassignFromEdge;
initController();

3
ui/src/app/device/device.directive.js
View File

@ -82,7 +82,8 @@ export default function DeviceDirective($compile, $templateCache, toast, $transl
onMakePublic: '&',
onUnassignFromCustomer: '&',
onManageCredentials: '&',
onDeleteDevice: '&'
onDeleteDevice: '&',
onUnassignFromEdge: '&',
}
};
}

1
ui/src/app/device/devices.tpl.html
View File

@ -29,6 +29,7 @@
on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])"
on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)"
on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
on-manage-credentials="vm.manageCredentials(event, vm.grid.detailsConfig.currentItem)"
on-delete-device="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-device>
</md-tab>

3
ui/src/app/entity-view/entity-view-fieldset.tpl.html
View File

@ -27,6 +27,9 @@
<md-button ng-click="onDeleteEntityView({event: $event})"
ng-show="!isEdit && entityViewScope === 'tenant'"
class="md-raised md-primary">{{ 'entity-view.delete' | translate }}</md-button>
<md-button ng-click="onUnassignFromEdge({event: $event})"
ng-show="!isEdit && entityViewScope === 'edge'"
class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
<div layout="row">
<md-button ngclipboard data-clipboard-action="copy"

1
ui/src/app/entity-view/entity-view.controller.js
View File

@ -106,6 +106,7 @@ export function EntityViewController($rootScope, userService, entityViewService,
vm.assignToCustomer = assignToCustomer;
vm.makePublic = makePublic;
vm.unassignFromCustomer = unassignFromCustomer;
vm.unassignFromEdge = unassignFromEdge;
initController();

3
ui/src/app/entity-view/entity-view.directive.js
View File

@ -144,7 +144,8 @@ export default function EntityViewDirective($q, $compile, $templateCache, $filte
onAssignToCustomer: '&',
onMakePublic: '&',
onUnassignFromCustomer: '&',
onDeleteEntityView: '&'
onDeleteEntityView: '&',
onUnassignFromEdge: '&'
}
};
}

1
ui/src/app/entity-view/entity-views.tpl.html
View File

@ -29,6 +29,7 @@
on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])"
on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)"
on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
on-delete-entity-view="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-entity-view>
</md-tab>
<md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}">