aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjpl2016-11-09 14:12:35 +0100
committerjpl2016-11-09 14:12:35 +0100
commit19dfbba96bdc518cb9b6597eaff0f97471058ef1 (patch)
tree02ff30d35bd0255503d50848aa448d99552bf9a5
parentd8132b0087d57673a17345ef4dce6e08f35f99be (diff)
downloadchouette-core-19dfbba96bdc518cb9b6597eaff0f97471058ef1.tar.bz2
fix add_stop select2 render
-rw-r--r--app/assets/javascripts/es6_browserified/components/BSelect2.js29
1 files changed, 18 insertions, 11 deletions
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js
index 08ae10e75..590e755fd 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js
@@ -28,6 +28,7 @@ class BSelect3 extends React.Component{
return (
<div className='input-group select2-bootstrap-append'>
<BSelect2 {...this.props} onSelect={ this.onChange.bind(this) }/>
+
<span className='input-group-btn'>
<button type='button' className='btn btn-default' onClick={this.onToggleEdit.bind(this)}>
<span className='fa fa-undo'></span>
@@ -36,17 +37,23 @@ class BSelect3 extends React.Component{
</div>
)
else
- return (
- <div className='input-group'>
- <span className='form-control'>{this.props.value.text} </span>
-
- <span className='input-group-btn'>
- <button type='button' className='btn btn-default' onClick={this.onToggleEdit.bind(this)}>
- <span className='fa fa-pencil'></span>
- </button>
- </span>
- </div>
- )
+ if(!this.props.value.id)
+ return (
+ <div>
+ <BSelect2 {...this.props} onSelect={ this.onChange.bind(this) }/>
+ </div>
+ )
+ else
+ return (
+ <div className='input-group'>
+ <span className='form-control'>{this.props.value.text} </span>
+ <span className='input-group-btn'>
+ <button type='button' className='btn btn-default' onClick={this.onToggleEdit.bind(this)}>
+ <span className='fa fa-pencil'></span>
+ </button>
+ </span>
+ </div>
+ )
}
}