X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fsrc%2Fsrc%2Fcomponents%2FEditDescriptorModelProperties.js;h=22ba1791f0a6b9010ec65949345416163d80922d;hb=80097691f3ed0adb4406906ef619c1042c2219ea;hp=c1d65be018c0e1387ec3e3376833d75f78c41eaf;hpb=6dfc2c17a4e7f26ffc4e00685a4b24dd22db7d47;p=osm%2FUI.git

diff --git a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
index c1d65be01..22ba1791f 100644
--- a/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
+++ b/skyquake/plugins/composer/src/src/components/EditDescriptorModelProperties.js
@@ -78,6 +78,8 @@ function getTitle(model = {}) {
 export default function EditDescriptorModelProperties(props) {
 
 	const container = props.container;
+	const readonly = props.readonly;
+	const isEditable = !readonly; //true
 
 	if (!(DescriptorModelFactory.isContainer(container))) {
 		return
@@ -148,6 +150,9 @@ export default function EditDescriptorModelProperties(props) {
 			}
 			CatalogItemsActions.catalogItemDescriptorChanged(this.getRoot());
 		}
+		if(readonly) {
+			return null;
+		}
 		return (
 				<Button className="inline-hint" onClick={onClickAddProperty.bind(container, property, path)} label="Add" src={imgAdd} />
 		);
@@ -165,6 +170,9 @@ export default function EditDescriptorModelProperties(props) {
 			}
 			CatalogItemsActions.catalogItemDescriptorChanged(this.getRoot());
 		}
+		if(readonly) {
+			return null;
+		}
 		return (
 			<Button className="remove-property-action inline-hint" title="Remove" onClick={onClickRemoveProperty.bind(container, property, path)} label="Remove" src={imgRemove}/>
 		);
@@ -233,7 +241,7 @@ export default function EditDescriptorModelProperties(props) {
 					onBlur={endEditing} 
 					onMouseDown={startEditing} 
 					onMouseOver={startEditing} 
-					readOnly={!isEditable}>
+					disabled={!isEditable}>
 						{options}
 				</select>
 			);
@@ -268,7 +276,7 @@ export default function EditDescriptorModelProperties(props) {
 					onBlur={endEditing} 
 					onMouseDown={startEditing} 
 					onMouseOver={startEditing} 
-					readOnly={!isEditable}>
+					disabled={!isEditable}>
 						{options}
 				</select>
 			);
@@ -301,7 +309,7 @@ export default function EditDescriptorModelProperties(props) {
 					onBlur={endEditing} 
 					onMouseDown={startEditing} 
 					onMouseOver={startEditing} 
-					readOnly={!isEditable}>
+					disabled={!isEditable}>
 						{options}
 				</select>
 			);
@@ -330,7 +338,7 @@ export default function EditDescriptorModelProperties(props) {
 					onBlur={endEditing} 
 					onMouseDown={startEditing} 
 					onMouseOver={startEditing} 
-					readOnly={!isEditable}>
+					disabled={!isEditable}>
 						{options}
 				</select>
 			);
@@ -351,7 +359,7 @@ export default function EditDescriptorModelProperties(props) {
 					onMouseOver={startEditing} 
 					onMouseOut={endEditing} 
 					onMouseLeave={endEditing} 
-					readOnly={!isEditable} />
+					disabled={!isEditable} />
 			);
 		}
 
@@ -370,7 +378,7 @@ export default function EditDescriptorModelProperties(props) {
 				onMouseOver={startEditing}
 				onMouseOut={endEditing}
 				onMouseLeave={endEditing}
-				readOnly={!isEditable}
+				disabled={!isEditable}
 			/>
 		);
 
@@ -428,7 +436,7 @@ export default function EditDescriptorModelProperties(props) {
 				// write the current choice value into the state
 				let choiceObject = utils.resolvePath(this.model, [name, selected].join('.'));
 				let isTopCase = false;
-				if (!choiceObject) {
+				if (choiceObject) {
 					isTopCase = true;
 					choiceObject = utils.resolvePath(this.model, [selected].join('.'));
 				}
@@ -553,6 +561,7 @@ export default function EditDescriptorModelProperties(props) {
 					onMouseOver={startEditing} 
 					onMouseOut={endEditing} 
 					onMouseLeave={endEditing}
+					disabled={!isEditable}
 				>
 					{options}
 				</select>