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

Merge pull request #66 from deaflynx/develop/2.6-edge

Browse Source 
Develop/2.6 edge fix import rule chains, added button, locale for edge
This commit is contained in:
VoBa 2020-12-18 12:01:48 +02:00 committed by GitHub
commit 966f149c08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,9 @@
<md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})" <md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})"
ng-show="!isEdit && (edgeScope === 'customer' || edgeScope === 'tenant') && isAssignedToCustomer" ng-show="!isEdit && (edgeScope === 'customer' || edgeScope === 'tenant') && isAssignedToCustomer"
class="md-raised md-primary">{{ isPublic ? 'edge.make-private' : 'edge.unassign-from-customer' | translate }}</md-button> class="md-raised md-primary">{{ isPublic ? 'edge.make-private' : 'edge.unassign-from-customer' | translate }}</md-button>
<md-button ng-click="onMakePublic({event: $event})"
ng-show="!isEdit && edgeScope === 'tenant' && !isAssignedToCustomer && !isPublic"
class="md-raised md-primary">{{ 'edge.make-public' | translate }}</md-button>
<md-button ng-click="onManageEdgeAssets({event: $event})" <md-button ng-click="onManageEdgeAssets({event: $event})"
ng-show="!isEdit && edgeScope === 'tenant'" ng-show="!isEdit && edgeScope === 'tenant'"
class="md-raised md-primary">{{ 'edge.manage-edge-assets' | translate }}</md-button> class="md-raised md-primary">{{ 'edge.manage-edge-assets' | translate }}</md-button>

2
ui/src/app/import-export/import-export.service.js
View File

@ -310,7 +310,7 @@ export default function ImportExport($log, $translate, $q, $mdDialog, $document,
return false; return false;
} }
if (angular.isUndefined(ruleChainImport.ruleChain.type)) { if (angular.isUndefined(ruleChainImport.ruleChain.type)) {
return false; ruleChainImport.ruleChain.type = types.ruleChainType.core;
} }
return true; return true;
} }

5
ui/src/app/locale/locale.constant-en_US.json
View File

@ -849,7 +849,10 @@
"deployed": "Deployed", "deployed": "Deployed",
"pending": "Pending", "pending": "Pending",
"unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer", "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer",
"enter-edge-type": "Enter edge type" "enter-edge-type": "Enter edge type",
"no-edge-types-matching": "No edge types matching '{{entitySubtype}}' were found.",
"edge-type-list-empty": "No edge types selected.",
"edge-types": "Edge types"
}, },
"error": { "error": {
"unable-to-connect": "Unable to connect to the server! Please check your internet connection.", "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",