diff options
| author | Xinhui | 2017-06-28 17:20:23 +0200 |
|---|---|---|
| committer | Xinhui | 2017-06-28 17:20:23 +0200 |
| commit | bed9795be0bb85d7c8c311fe4ee0fb12e46832b4 (patch) | |
| tree | 18459aa9dcb81821a88f2acdf9ba72cee9be5616 /app/controllers/referentials_controller.rb | |
| parent | 641b1458236d2718a76ffaf0c04a5998623276bf (diff) | |
| parent | b260c832c8e129dbeacfe065d01bd0732dd80701 (diff) | |
| download | chouette-core-bed9795be0bb85d7c8c311fe4ee0fb12e46832b4.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'app/controllers/referentials_controller.rb')
| -rw-r--r-- | app/controllers/referentials_controller.rb | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index aa5b359da..1239d512f 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -24,19 +24,21 @@ class ReferentialsController < BreadcrumbController end def show - resource.switch - show! do |format| - format.json { - render :json => { :lines_count => resource.lines.count, - :networks_count => resource.networks.count, - :vehicle_journeys_count => resource.vehicle_journeys.count + resource.vehicle_journey_frequencies.count, - :time_tables_count => resource.time_tables.count, - :referential_id => resource.id} - } - format.html { build_breadcrumb :show} - end - - @reflines = lines_collection.paginate(page: params[:page], per_page: 10) + resource.switch + show! do |format| + @referential = @referential.decorate + + format.json { + render :json => { :lines_count => resource.lines.count, + :networks_count => resource.networks.count, + :vehicle_journeys_count => resource.vehicle_journeys.count + resource.vehicle_journey_frequencies.count, + :time_tables_count => resource.time_tables.count, + :referential_id => resource.id} + } + format.html { build_breadcrumb :show} + end + + @reflines = lines_collection.paginate(page: params[:page], per_page: 10) end def edit |
