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

Misc fixes

Browse Source
This commit is contained in:
Volodymyr Babak 2018-10-09 20:58:27 +03:00
parent 0cfb73127b
commit c34fb5d963
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,12 +59,15 @@
ng-model="entityView.type" ng-model="entityView.type"
entity-type="types.entityType.entityView"> entity-type="types.entityType.entityView">
</tb-entity-subtype-autocomplete> </tb-entity-subtype-autocomplete>
<section layout="column">
<label translate class="tb-title no-padding">entity-view.related-entity</label>
<tb-entity-select flex ng-disabled="!isEdit" <tb-entity-select flex ng-disabled="!isEdit"
the-form="theForm" the-form="theForm"
tb-required="true" tb-required="true"
allowed-entity-types="allowedEntityTypes" allowed-entity-types="allowedEntityTypes"
ng-model="entityView.entityId"> ng-model="entityView.entityId">
</tb-entity-select> </tb-entity-select>
</section>
<md-input-container class="md-block"> <md-input-container class="md-block">
<label translate>entity-view.description</label> <label translate>entity-view.description</label>
<textarea ng-model="entityView.additionalInfo.description" rows="2"></textarea> <textarea ng-model="entityView.additionalInfo.description" rows="2"></textarea>

7
ui/src/app/entity/entity-subtype-autocomplete.directive.js
View File

@ -136,6 +136,13 @@ export default function EntitySubtypeAutocomplete($compile, $templateCache, $q,
scope.$on('deviceSaved', function() { scope.$on('deviceSaved', function() {
scope.entitySubtypes = null; scope.entitySubtypes = null;
}); });
} else if (scope.entityType == types.entityType.entityView) {
scope.selectEntitySubtypeText = 'entity-view.select-entity-view-type';
scope.entitySubtypeText = 'entity-view.entity-view-type';
scope.entitySubtypeRequiredText = 'entity-view.entity-view-type-required';
scope.$on('entityViewSaved', function() {
scope.entitySubtypes = null;
});
} }
} }

1
ui/src/app/help/help-links.constant.js
View File

@ -96,6 +96,7 @@ export default angular.module('thingsboard.help', [])
customers: helpBaseUrl + "/docs/user-guide/ui/customers", customers: helpBaseUrl + "/docs/user-guide/ui/customers",
assets: helpBaseUrl + "/docs/user-guide/ui/assets", assets: helpBaseUrl + "/docs/user-guide/ui/assets",
devices: helpBaseUrl + "/docs/user-guide/ui/devices", devices: helpBaseUrl + "/docs/user-guide/ui/devices",
entityViews: helpBaseUrl + "/docs/user-guide/ui/entity-views",
dashboards: helpBaseUrl + "/docs/user-guide/ui/dashboards", dashboards: helpBaseUrl + "/docs/user-guide/ui/dashboards",
users: helpBaseUrl + "/docs/user-guide/ui/users", users: helpBaseUrl + "/docs/user-guide/ui/users",
widgetsBundles: helpBaseUrl + "/docs/user-guide/ui/widget-library#bundles", widgetsBundles: helpBaseUrl + "/docs/user-guide/ui/widget-library#bundles",

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

@ -844,7 +844,8 @@
"client-attributes": "Client attributes", "client-attributes": "Client attributes",
"shared-attributes": "Shared attributes", "shared-attributes": "Shared attributes",
"server-attributes": "Server attributes", "server-attributes": "Server attributes",
"latest-timeseries": "Latest timeseries" "latest-timeseries": "Latest timeseries",
"related-entity": "Related entity"
}, },
"event": { "event": {
"event-type": "Event type", "event-type": "Event type",