简柏林 / thingskit · Commits

Commit 265f9e22ff9a84aa3ad4bfc03cad4cf3a2cd11cb

Authored by Igor Kulikov
1 parent 016191f3

Fix Entity View fields

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -72,6 +72,7 @@ public class EntityKeyMapping { @@ -72,6 +72,7 @@ public class EntityKeyMapping {
72 private static final String ZIP = "zip"; 72 private static final String ZIP = "zip";
73 private static final String PHONE = "phone"; 73 private static final String PHONE = "phone";
74 74
  75 + public static final List<String> typedEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE);
75 public static final List<String> commonEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME); 76 public static final List<String> commonEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME);
76 public static final List<String> dashboardEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, TITLE); 77 public static final List<String> dashboardEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, TITLE);
77 public static final List<String> labeledEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, LABEL); 78 public static final List<String> labeledEntityFields = Arrays.asList(CREATED_TIME, ENTITY_TYPE, NAME, TYPE, LABEL);
@@ -83,7 +84,7 @@ public class EntityKeyMapping { @@ -83,7 +84,7 @@ public class EntityKeyMapping {
83 static { 84 static {
84 allowedEntityFieldMap.put(EntityType.DEVICE, new HashSet<>(labeledEntityFields)); 85 allowedEntityFieldMap.put(EntityType.DEVICE, new HashSet<>(labeledEntityFields));
85 allowedEntityFieldMap.put(EntityType.ASSET, new HashSet<>(labeledEntityFields)); 86 allowedEntityFieldMap.put(EntityType.ASSET, new HashSet<>(labeledEntityFields));
86 - allowedEntityFieldMap.put(EntityType.ENTITY_VIEW, new HashSet<>(labeledEntityFields)); 87 + allowedEntityFieldMap.put(EntityType.ENTITY_VIEW, new HashSet<>(typedEntityFields));
87 88
88 allowedEntityFieldMap.put(EntityType.TENANT, new HashSet<>(contactBasedEntityFields)); 89 allowedEntityFieldMap.put(EntityType.TENANT, new HashSet<>(contactBasedEntityFields));
89 allowedEntityFieldMap.get(EntityType.TENANT).add(REGION); 90 allowedEntityFieldMap.get(EntityType.TENANT).add(REGION);