Browse Source

Minor fixes

pull/3576/head
Igor Kulikov 6 years ago
parent
commit
8cfbcee05e
  1. 1
      common/data/src/main/java/org/thingsboard/server/common/data/SearchTextBasedWithAdditionalInfo.java
  2. 2
      ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts
  3. 3
      ui-ngx/src/app/shared/models/entity-type.models.ts
  4. 2
      ui-ngx/src/assets/locale/locale.constant-en_US.json

1
common/data/src/main/java/org/thingsboard/server/common/data/SearchTextBasedWithAdditionalInfo.java

@ -59,7 +59,6 @@ public abstract class SearchTextBasedWithAdditionalInfo<I extends UUIDBased> ext
}
public void setAdditionalInfo(JsonNode addInfo) {
// TODO why set additionalInfoBytes to [110,117,108,108] if JsonNode is null
setJson(addInfo, json -> this.additionalInfo = json, bytes -> this.additionalInfoBytes = bytes);
}

2
ui-ngx/src/app/modules/home/pages/admin/admin-routing.module.ts

@ -28,7 +28,7 @@ const routes: Routes = [
{
path: 'settings',
data: {
auth: [Authority.SYS_ADMIN, Authority.TENANT_ADMIN],
auth: [Authority.SYS_ADMIN],
breadcrumb: {
label: 'admin.system-settings',
icon: 'settings'

3
ui-ngx/src/app/shared/models/entity-type.models.ts

@ -47,8 +47,7 @@ export enum EntityType {
RULE_NODE = 'RULE_NODE',
ENTITY_VIEW = 'ENTITY_VIEW',
WIDGETS_BUNDLE = 'WIDGETS_BUNDLE',
WIDGET_TYPE = 'WIDGET_TYPE',
OAUTH2_CLIENT_REGISTRATION = 'OAUTH2_CLIENT_REGISTRATION'
WIDGET_TYPE = 'WIDGET_TYPE'
}
export enum AliasEntityType {

2
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -100,7 +100,7 @@
"proxy-user": "Proxy user",
"proxy-password": "Proxy password",
"send-test-mail": "Send test mail",
"security-settings": "Security Settings",
"security-settings": "Security settings",
"password-policy": "Password policy",
"minimum-password-length": "Minimum password length",
"minimum-password-length-required": "Minimum password length is required",

Loading…
Cancel
Save