diff options
| author | Thomas Haddad | 2017-03-13 15:00:59 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-03-13 15:00:59 +0100 |
| commit | 2180edc34c7936e3e9a507a36cdf2200553bed90 (patch) | |
| tree | d7c30baa4620bb32cc7fae9a4b3f033e12ca66f7 | |
| parent | b7961e9d2bf0862ff3ec08db6f64c7fa323f9123 (diff) | |
| download | chouette-core-2180edc34c7936e3e9a507a36cdf2200553bed90.tar.bz2 | |
Refs #2776: Add totalCount in vj rabl
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/index.rabl | 12 |
2 files changed, 11 insertions, 3 deletions
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 169ecdb13..b82f082ce 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js @@ -272,7 +272,7 @@ const actions = { dispatch(actions.unavailableServer()) } else { let val - for (val of json){ + for (val of json.vehicle_journeys){ var timeTables = [] let tt for (tt of val.time_tables){ diff --git a/app/views/vehicle_journeys/index.rabl b/app/views/vehicle_journeys/index.rabl index eb042f7a9..af6249f95 100644 --- a/app/views/vehicle_journeys/index.rabl +++ b/app/views/vehicle_journeys/index.rabl @@ -1,3 +1,11 @@ -collection @vehicle_journeys +object false + +node(:total) {@vehicle_journeys.total_entries} +if @vehicle_journeys.length != 0 + child( @vehicle_journeys, :object_root => false) do + extends "vehicle_journeys/show" + end +else + node(:vehicle_journeys) {[]} +end -extends "vehicle_journeys/show" |