aboutsummaryrefslogtreecommitdiffstats
path: root/app/javascript
diff options
context:
space:
mode:
authorLuc Donnet2018-02-20 10:38:45 +0100
committerGitHub2018-02-20 10:38:45 +0100
commitd5ff5c82041a9807dbb8bb9a598b74e99ad538f9 (patch)
tree8386fe81d95460b60c77a62385a8f3e8f2df055f /app/javascript
parentd0163321a875a64b8f1e15a614d18663d013da3c (diff)
parent5404087a961c831b10c3d597f3113f05b6b02102 (diff)
downloadchouette-core-d5ff5c82041a9807dbb8bb9a598b74e99ad538f9.tar.bz2
Merge pull request #294 from af83/5863-use-shallow-urls-for-referentials
5863 Remove workbench id from the querystring
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js b/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
index 7ab85a1ea..72dbd0152 100644
--- a/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
+++ b/app/javascript/vehicle_journeys/components/tools/select2s/MissionSelect2.js
@@ -29,11 +29,11 @@ export default class BSelect4 extends Component {
val = this.props.selection.selectedJPModal
}
}
- if(this.useAjax()){
- val = val.published_name
- }
- else{
- if(val){
+ if(val){
+ if(this.useAjax()){
+ val = val.published_name
+ }
+ else{
val = val.id
}
}