From 6acd65bbda4bf95d6c7a7218b390deba86a6aedb Mon Sep 17 00:00:00 2001 From: Alban Peignier Date: Mon, 28 Nov 2016 10:53:24 +0100 Subject: Define Route candidate_opposite_routes in RoutesController to fix loading in referentials#new. Refs #2052 --- app/controllers/routes_controller.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'app/controllers/routes_controller.rb') diff --git a/app/controllers/routes_controller.rb b/app/controllers/routes_controller.rb index a7e8e32a6..aecdb480d 100644 --- a/app/controllers/routes_controller.rb +++ b/app/controllers/routes_controller.rb @@ -9,6 +9,8 @@ class RoutesController < ChouetteController belongs_to :line, :parent_class => Chouette::Line, :optional => true, :polymorphic => true end + before_action :define_candidate_opposite_routes, only: [:new, :edit, :create, :update] + def index index! do |format| format.html { redirect_to referential_line_path(@referential,@line) } @@ -74,6 +76,15 @@ class RoutesController < ChouetteController end end + def define_candidate_opposite_routes + @candidate_opposite_routes = + if params[:id] + resource.line.routes.where("id <> ?", resource) + else + parent.routes + end + end + private def route_params @@ -81,4 +92,3 @@ class RoutesController < ChouetteController end end - -- cgit v1.2.3