X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fframework%2Fwidgets%2Fform_controls%2FselectOption.jsx;h=397963e3a901ca3a5c65eb2d3cdfa90829462b29;hb=2279bd2b93eb7cf73526ee3cc1ae299f4bcfe48e;hp=21d4a0a4d93f2b3ebbcd6ba6df7e4d5c31d361ce;hpb=bca9d9cf04b3068c870c4fd45ca6cfc2fb79034d;p=osm%2FUI.git

diff --git a/skyquake/framework/widgets/form_controls/selectOption.jsx b/skyquake/framework/widgets/form_controls/selectOption.jsx
index 21d4a0a4d..397963e3a 100644
--- a/skyquake/framework/widgets/form_controls/selectOption.jsx
+++ b/skyquake/framework/widgets/form_controls/selectOption.jsx
@@ -28,7 +28,7 @@ export default class SelectOption extends React.Component {
   render() {
     let html;
     let defaultValue = this.props.defaultValue;
-    let options =  this.props.options.map(function(op, i) {
+    let options =  this.props.options && this.props.options.map(function(op, i) {
     let value;
     let label;
     if(typeof(op) == 'object') {
@@ -40,12 +40,12 @@ export default class SelectOption extends React.Component {
     }
 
       return <option key={i} value={JSON.stringify(value)}>{label}</option>
-    });
+    }) || [];
     if (this.props.initial) {
       options.unshift(<option key='blank' value={JSON.stringify(this.props.defaultValue)}></option>);
     }
     html = (
-        <label key={this.props.key}>
+        <label key={this.props.key} className={this.props.className}>
             {this.props.label}
             {
               this.props.readonly ? defaultValue
@@ -53,6 +53,7 @@ export default class SelectOption extends React.Component {
                   <select
                     className={this.props.className}
                     onChange={this.handleOnChange}
+                    value={JSON.stringify(this.props.value)}
                     defaultValue={JSON.stringify(defaultValue)}>
                       {
                        options