aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Perles2015-12-15 11:53:45 +0100
committerBruno Perles2015-12-16 10:13:33 +0100
commitd4734528fa49ce91159ae52c92344ea9db650908 (patch)
tree08c1c55528017d245445cb9f0d03a46295ff7979
parent366a8cfd46ecc4856937c14b3b21f947e8a33e27 (diff)
downloadchouette-core-d4734528fa49ce91159ae52c92344ea9db650908.tar.bz2
#0041423 count on VJF
-rw-r--r--app/controllers/referentials_controller.rb2
-rw-r--r--app/models/referential.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb
index 375ce126a..b03aec7e1 100644
--- a/app/controllers/referentials_controller.rb
+++ b/app/controllers/referentials_controller.rb
@@ -18,7 +18,7 @@ class ReferentialsController < BreadcrumbController
format.json {
render :json => { :lines_count => resource.lines.count,
:networks_count => resource.networks.count,
- :vehicle_journeys_count => resource.vehicle_journeys.count,
+ :vehicle_journeys_count => resource.vehicle_journeys.count + resource.vehicle_journey_frequencies.count,
:time_tables_count => resource.time_tables.count,
:referential_id => resource.id}
}
diff --git a/app/models/referential.rb b/app/models/referential.rb
index d537246e5..aa2c3d838 100644
--- a/app/models/referential.rb
+++ b/app/models/referential.rb
@@ -91,6 +91,10 @@ class Referential < ActiveRecord::Base
Chouette::VehicleJourney.all
end
+ def vehicle_journey_frequencies
+ Chouette::VehicleJourneyFrequency.all
+ end
+
def route_sections
Chouette::RouteSection.all
end