manage stop areas for connection links

2 files changed, 30 insertions, 2 deletions

diff --git a/app/controllers/connection_link_areas_controller.rb b/app/controllers/connection_link_areas_controller.rb
new file mode 100644
index 000000000..40f029801
--- /dev/null
+++ b/app/controllers/connection_link_areas_controller.rb
@@ -0,0 +1,21 @@
+class ConnectionLinkAreasController < ChouetteController
+
+  respond_to :json, :only => :index
+
+  def index
+    respond_to do |format|  
+      format.json { render :json => areas_maps }  
+    end  
+  end
+
+  def areas_maps
+    areas.collect do |area|
+      { :id => area.id.to_s, :name => "#{area.name} #{area.country_code}" }
+    end
+  end
+
+  def areas 
+    referential.connection_links.find(params[:connection_link_id]).possible_areas.select{ |p| p.name =~ /#{params[:q]}/i  }       
+  end
+
+end
diff --git a/app/controllers/connection_links_controller.rb b/app/controllers/connection_links_controller.rb
index 327fb7989..8790426f7 100644
--- a/app/controllers/connection_links_controller.rb
+++ b/app/controllers/connection_links_controller.rb
@@ -2,14 +2,21 @@ class ConnectionLinksController < ChouetteController
   defaults :resource_class => Chouette::ConnectionLink
 
   belongs_to :referential do
-    #belongs_to :departure, :parent_class => Chouette::StopArea, :optional => false
-    #belongs_to :arrival, :parent_class => Chouette::StopArea, :optional => false
+    belongs_to :departure, :parent_class => Chouette::StopArea, :optional => true
+    belongs_to :arrival, :parent_class => Chouette::StopArea, :optional => true
   end
 
   respond_to :html, :xml, :json
 
+  def select_areas
+    @connection_link = connection_link
+    @departure = connection_link.departure
+    @arrival = connection_link.arrival
+  end
 
   protected
+  
+  alias_method :connection_link, :resource
 
   def collection    
     @q = referential.connection_links.search(params[:q])