aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlban Peignier2017-12-26 23:04:21 +0100
committerAlban Peignier2017-12-26 23:04:21 +0100
commit0b7805f0d7d9a8fba394fd81a861044a821595bd (patch)
treecff42a72b2b760d298ea473dc2268f17c6ffeada
parentd3445d085b607544dc6355956cd228835258d612 (diff)
downloadchouette-core-0b7805f0d7d9a8fba394fd81a861044a821595bd.tar.bz2
Include StopArea type in select2 text for routes#edit. Refs #5382
-rw-r--r--app/javascript/routes/components/BSelect2.js21
1 files changed, 15 insertions, 6 deletions
diff --git a/app/javascript/routes/components/BSelect2.js b/app/javascript/routes/components/BSelect2.js
index 29983dd58..0d8d7787f 100644
--- a/app/javascript/routes/components/BSelect2.js
+++ b/app/javascript/routes/components/BSelect2.js
@@ -101,12 +101,21 @@ class BSelect2 extends Component{
},
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 });
+ }
)
};
},