Merge branch 'master' into 0000-docker

1 files changed, 20 insertions, 10 deletions

diff --git a/app/javascript/routes/components/BSelect2.js b/app/javascript/routes/components/BSelect2.js
index 340d9df95..035bce155 100644
--- a/app/javascript/routes/components/BSelect2.js
+++ b/app/javascript/routes/components/BSelect2.js
@@ -1,6 +1,7 @@
 import _ from'lodash'
-import React, { Component, PropTypes } from 'react'
-import Select2 from 'react-select2'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import Select2 from 'react-select2-wrapper'
 
 
 // get JSON full path
@@ -84,7 +85,7 @@ class BSelect2 extends Component{
         onSelect={ this.props.onSelect }
         ref='newSelect'
         options={{
-          placeholder: this.context.I18n.routes.edit.select2.placeholder,
+          placeholder: this.context.I18n.t("routes.edit.select2.placeholder"),
           allowClear: true,
           language: 'fr', /* Doesn't seem to work... :( */
           theme: 'bootstrap',
@@ -96,17 +97,26 @@ class BSelect2 extends Component{
             data: function(params) {
               return {
                 q: params.term,
-                target_type: 'zdep'
+                scope: 'route_editor'
               };
             },
             processResults: function(data, params) {
               return {
-                results: data.map(
-                  item => _.assign(
-                    {},
-                    item,
-                    { text: item.name + ", " + item.zip_code + " " + item.short_city_name + " <small><em>(" + item.user_objectid + ")</em></small>" }
-                  )
+                 results: data.map(
+                  function(item) {
+                      var text = item.name;
+                      if (item.zip_code || item.short_city_name) {
+                          text += ","
+                      }
+                      if (item.zip_code) {
+                          text += ` ${item.zip_code}`
+                      }
+                      if (item.short_city_name) {
+                          text += ` ${item.short_city_name}`
+                      }
+                      text += ` <small><em>(${item.area_type.toUpperCase()}, ${item.user_objectid})</em></small>`;
+                      return _.assign({}, item, { text: text });
+                  }
                 )
               };
             },