Refs #3328: updating objectid with shorten version on VJ and JP

4 files changed, 12 insertions, 3 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
index 54d62f999..0ed961f44 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/actions/index.js
@@ -84,6 +84,10 @@ const actions = {
   resetValidation: (target) => {
     $(target).parent().removeClass('has-error').children('.help-block').remove()
   },
+  humanOID : (oid) => {
+    var a = oid.split(':')
+    return a[a.length - 1]
+  },
   validateFields : (fields) => {
     const test = []
 
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
index dcc044c56..14ddf2b99 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -62,7 +62,7 @@ class JourneyPattern extends Component{
           )}
 
           <div className='th'>
-            <div className='strong mb-xs'>{this.props.value.object_id ? this.props.value.object_id : '-'}</div>
+            <div className='strong mb-xs'>{this.props.value.object_id ? actions.humanOID(this.props.value.object_id) : '-'}</div>
             <div>{this.props.value.registration_number}</div>
             <div>{actions.getChecked(this.props.value.stop_points).length} arrêt(s)</div>
 
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index ea03694bd..0e6f5ed12 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -248,6 +248,10 @@ const actions = {
     type: 'RECEIVE_TOTAL_COUNT',
     total
   }),
+  humanOID : (oid) => {
+    var a = oid.split(':')
+    return a[a.length - 1]
+  },
   fetchVehicleJourneys : (dispatch, currentPage, nextPage, queryString) => {
     if(currentPage == undefined){
       currentPage = 1
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index d795d76e3..6f338f747 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -1,6 +1,7 @@
 var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
+var actions = require('../actions')
 
 class VehicleJourney extends Component {
   constructor(props) {
@@ -48,8 +49,8 @@ class VehicleJourney extends Component {
     return (
       <div className={'t2e-item' + (this.props.value.deletable ? ' disabled' : '') + (this.props.value.errors ? ' has-error': '')}>
         <div className='th'>
-          <div className='strong mb-xs'>{this.props.value.objectid ? this.props.value.objectid : '-'}</div>
-          <div>{this.props.value.journey_pattern.objectid}</div>
+          <div className='strong mb-xs'>{this.props.value.objectid ? actions.humanOID(this.props.value.objectid) : '-'}</div>
+          <div>{actions.humanOID(this.props.value.journey_pattern.objectid)}</div>
           {this.props.value.time_tables.map((tt, i)=>
             <div key={i}>{this.timeTableURL(tt)}</div>
           )}