Merge branch 'master' into staging

2 files changed, 2 insertions, 5 deletions

diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js
index 8bea5a990..4ff3f77ea 100644
--- a/app/javascript/journey_patterns/actions/index.js
+++ b/app/javascript/journey_patterns/actions/index.js
@@ -90,10 +90,6 @@ const actions = {
   resetValidation: (target) => {
     $(target).parent().removeClass('has-error').children('.help-block').remove()
   },
-  humanOID : (oid) => {
-    let shortOId = oid.split(':')[2].split("-").pop()
-    return shortOId.length > 10 ? `${shortOId.slice(0, 10)}...` : shortOId
-  },
   validateFields : (fields) => {
     const test = []
 
@@ -201,6 +197,7 @@ const actions = {
               journeyPatterns.push({
                 name: val.name,
                 object_id: val.object_id,
+                short_id: val.short_id,
                 published_name: val.published_name,
                 registration_number: val.registration_number,
                 stop_points: val.route_short_description.stop_points,
diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js
index 34d102c5d..d4c9816ec 100644
--- a/app/javascript/journey_patterns/components/JourneyPattern.js
+++ b/app/javascript/journey_patterns/components/JourneyPattern.js
@@ -68,7 +68,7 @@ export default class JourneyPattern extends Component{
         {/* this.props.value.errors ? this.getErrors(this.props.value.errors) : '' */}
 
         <div className='th'>
-          <div className='strong mb-xs'>{this.props.value.object_id ? actions.humanOID(this.props.value.object_id) : '-'}</div>
+          <div className='strong mb-xs'>{this.props.value.object_id ? this.props.value.short_id : '-'}</div>
           <div>{this.props.value.registration_number}</div>
           <div>{actions.getChecked(this.props.value.stop_points).length} arrêt(s)</div>