diff options
3 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js index 1e121b473..314d481d4 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js @@ -71,6 +71,7 @@ class CreateModal extends Component { <div className='form-group'> <label className='control-label is-required'>Nom public de la mission</label> <MissionSelect2 + selection={this.props.modal.modalProps} onSelect2JourneyPattern={this.props.onSelect2JourneyPattern} isFilter={false} /> diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js index 68cdfa1a2..36aaa5cfd 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/select2s/MissionSelect2.js @@ -13,11 +13,12 @@ class BSelect4 extends React.Component{ super(props) } + render() { return ( <Select2 - data={(this.props.isFilter) ? [this.props.filters.query.journeyPattern.published_name] : undefined} - value={(this.props.isFilter) ? this.props.filters.query.journeyPattern.published_name : undefined} + data={(this.props.isFilter) ? [this.props.filters.query.journeyPattern.published_name] : ((this.props.selection.selectedJPModal) ? [this.props.selection.selectedJPModal.published_name] : undefined)} + value={(this.props.isFilter) ? this.props.filters.query.journeyPattern.published_name : ((this.props.selection.selectedJPModal) ? this.props.selection.selectedJPModal.published_name : undefined) } onSelect={(e) => this.props.onSelect2JourneyPattern(e)} multiple={false} ref='journey_pattern_id' @@ -42,7 +43,7 @@ class BSelect4 extends React.Component{ item => _.assign( {}, item, - {text: item.published_name} + { text: '<small><em>Nom: </em></small>' + item.published_name + '<br/><small><em>Code: </em></small>' + item.registration_number + '<br/><small><em>ID: </em></small>' + _.last(_.split(item.object_id, ':')) } ) ) }; @@ -50,6 +51,7 @@ class BSelect4 extends React.Component{ cache: true }, minimumInputLength: 2, + escapeMarkup: function (markup) { return markup; }, templateResult: formatRepo }} /> diff --git a/app/assets/stylesheets/components/_select2.sass b/app/assets/stylesheets/components/_select2.sass index 2a0863173..960e8b10b 100644 --- a/app/assets/stylesheets/components/_select2.sass +++ b/app/assets/stylesheets/components/_select2.sass @@ -2,6 +2,11 @@ // Select2 Customisation // //-----------------------// +// Dirty hotfix for select2 i18n not working properly +// .select2-results__options +// .select2-results__message, .loading-results +// display: none + .select2-selection__placeholder color: rgba($grey, 0.65) font-style: italic |