diff options
| author | Teddy Wing | 2017-06-12 16:49:57 +0200 |
|---|---|---|
| committer | Teddy Wing | 2017-06-12 16:49:57 +0200 |
| commit | 3a7fc919944b3c090eb5d9eab576eb7c1ac3df9d (patch) | |
| tree | 6e1eec97dd2626bd9a0803572b26bb61b920f507 /app | |
| parent | 6125263e31fb5518606b6c61ceb271978c9233c1 (diff) | |
| parent | c82bde8ec037d378203f7501a036a92aa35ca703 (diff) | |
| download | chouette-core-3a7fc919944b3c090eb5d9eab576eb7c1ac3df9d.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 3479-refactor-table_builder-helper
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/es6_browserified/itineraries/index.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js index 601824c3c..504734801 100644 --- a/app/assets/javascripts/es6_browserified/itineraries/index.js +++ b/app/assets/javascripts/es6_browserified/itineraries/index.js @@ -38,7 +38,7 @@ const getInitialState = () => { for_alighting: v.for_alighting || "normal", longitude: v.longitude || 0, latitude: v.latitude || 0, - comment: v.comment, + comment: v.comment.replace("'", "\'"), olMap: { isOpened: false, json: {} diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js index 7f5f6bcbe..f4d1444cf 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js @@ -61,7 +61,7 @@ class DuplicateVehicleJourney extends Component { <form> <div className='modal-body'> <div className='row'> - <div className={'col-lg-3 col-md-3 col-sm-3 col-xs-3 ' + (actions.getSelected(this.props.vehicleJourneys).length > 1 ? 'hidden' : '' )}> + <div className={'col-lg-3 col-lg-offset-1 col-md-3 col-md-offset-1 col-sm-3 col-sm-offset-1 col-xs-3 col-xs-offset-1 ' + (actions.getSelected(this.props.vehicleJourneys).length > 1 ? 'hidden' : '' )}> <div className='form-group'> <label className='control-label is-required'>Horaire de départ</label> <span className={'input-group time' + (actions.getSelected(this.props.vehicleJourneys).length > 1 ? ' disabled' : '')}> @@ -88,7 +88,7 @@ class DuplicateVehicleJourney extends Component { </div> </div> - <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'> + <div className='col-lg-4 col-md-4 col-sm-4 col-xs-4'> <div className='form-group'> <label className='control-label is-required'>Nombre de courses à créer et dupliquer</label> <input @@ -96,6 +96,7 @@ class DuplicateVehicleJourney extends Component { ref='duplicate_number' min='1' max='20' + defaultValue='1' className='form-control' onKeyDown={(e) => actions.resetValidation(e.currentTarget)} required @@ -111,6 +112,7 @@ class DuplicateVehicleJourney extends Component { ref='additional_time' min='-59' max='59' + defaultValue='0' className='form-control' onKeyDown={(e) => actions.resetValidation(e.currentTarget)} required |