Browse Source

fixed locale.constant-en_US.json, lower case for sql-queries

pull/10454/head
dashevchenko 2 years ago
parent
commit
c748963ec8
  1. 8
      dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
  2. 1
      ui-ngx/src/assets/locale/locale.constant-en_US.json

8
dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java

@ -84,11 +84,11 @@ public class EntityKeyMapping {
public static final String OWNER_NAME = "ownerName";
public static final String OWNER_TYPE = "ownerType";
public static final String OWNER_NAME_SELECT_QUERY = "case when e.customer_id = '" + NULL_UUID + "' " +
"THEN (select title from tenant where id = e.tenant_id) " +
"ELSE (select title from customer where id = e.customer_id) END";
"then (select title from tenant where id = e.tenant_id) " +
"else (select title from customer where id = e.customer_id) end";
public static final String OWNER_TYPE_SELECT_QUERY = "case when e.customer_id = '" + NULL_UUID + "' " +
"THEN 'TENANT' " +
"ELSE 'CUSTOMER' END";
"then 'TENANT' " +
"else 'CUSTOMER' end";
public static final Map<String, String> ownerPropertiesFunctions = Map.of(
OWNER_NAME, OWNER_NAME_SELECT_QUERY,
OWNER_TYPE, OWNER_TYPE_SELECT_QUERY

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

@ -2274,7 +2274,6 @@
"label": "Label",
"queue-name": "Queue name",
"service-id": "Service Id",
"label": "Label",
"owner-name": "Owner name",
"owner-type": "Owner type"
},

Loading…
Cancel
Save