100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Minor updates
Rich Turnere90a078dac1b
diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.javaindex bbc4dfe53..7a8cb588a 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java@@ -37,7 +37,7 @@ import java.util.Optional;@Entitypublic class GroupAsset extends Asset<GroupAsset> {- public static final AttributeDescriptor<String> CHILD_ASSET_TYPE = new AttributeDescriptor<>("childAssetType", ValueType.ASSET_TYPE);+ public static final AttributeDescriptor<String> CHILD_ASSET_TYPE = new AttributeDescriptor<>("childAssetType", ValueType.ASSET_TYPE, new MetaItem<>(MetaItemType.READ_ONLY));public static final AssetDescriptor<GroupAsset> DESCRIPTOR = new AssetDescriptor<>("folder", "B3B3B3", GroupAsset.class);/**diff --git a/ui/component/or-mwc-components/src/or-mwc-input.ts b/ui/component/or-mwc-components/src/or-mwc-input.tsindex c7f629704..00155a7df 100644--- a/ui/component/or-mwc-components/src/or-mwc-input.ts+++ b/ui/component/or-mwc-components/src/or-mwc-input.ts@@ -333,7 +333,7 @@ export const getValueHolderInputTemplateProvider: ValueInputProviderGenerator =} else if (notEmptyConstraint && !pattern) {pattern = ".+";}- if (allowedValuesConstraint && allowedValuesConstraint.allowedValues) {+ if ((!options.disabled && !options.readonly) && allowedValuesConstraint && allowedValuesConstraint.allowedValues) {const allowedLabels = allowedValuesConstraint.allowedValueNames && allowedValuesConstraint.allowedValueNames.length === allowedValuesConstraint.allowedValues.length ? allowedValuesConstraint.allowedValueNames : undefined;selectOptions = allowedValuesConstraint.allowedValues.map((v, i) => {const label = allowedLabels ? allowedLabels[i] : typeof v === "string" ? Util.getAllowedValueLabel(v) : "" + i;