diff options
| author | Luc Donnet | 2017-07-13 17:13:12 +0200 |
|---|---|---|
| committer | Luc Donnet | 2017-07-13 17:13:12 +0200 |
| commit | ea3ad8d1f9db76e3d2dfc5f96c930af8db074690 (patch) | |
| tree | bde3f033418d512a80ef28703abb4c021c5a0f06 /app/controllers/referential_lines_controller.rb | |
| parent | 3ef09ffa403dd253c19537bd3d477357d85bfa3d (diff) | |
| parent | 0a2f9ff965389133fb9656dfb5b222ccfc2b0531 (diff) | |
| download | chouette-core-ea3ad8d1f9db76e3d2dfc5f96c930af8db074690.tar.bz2 | |
Merge branch 'master' into staging
Diffstat (limited to 'app/controllers/referential_lines_controller.rb')
| -rw-r--r-- | app/controllers/referential_lines_controller.rb | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/app/controllers/referential_lines_controller.rb b/app/controllers/referential_lines_controller.rb index 4b4a822b4..1da64991d 100644 --- a/app/controllers/referential_lines_controller.rb +++ b/app/controllers/referential_lines_controller.rb @@ -10,18 +10,6 @@ class ReferentialLinesController < ChouetteController belongs_to :referential - def index - @hide_group_of_line = referential.group_of_lines.empty? - index! do |format| - format.html { - if collection.out_of_bounds? - redirect_to params.merge(:page => 1) - end - build_breadcrumb :index - } - end - end - def show @routes = resource.routes @@ -49,6 +37,14 @@ class ReferentialLinesController < ChouetteController ) show! do + @line = ReferentialLineDecorator.decorate( + @line, + context: { + referential: referential, + current_organisation: current_organisation + } + ) + build_breadcrumb :show end end |
