diff options
| author | Xinhui Xu | 2017-11-30 11:09:36 +0100 | 
|---|---|---|
| committer | GitHub | 2017-11-30 11:09:36 +0100 | 
| commit | a7930abe5a70b8b964af0dcbf86fe0a587ea98cb (patch) | |
| tree | dc8e1a1ff57ff0328e4b8b2ac72932f82e379406 /app/controllers/stop_areas_controller.rb | |
| parent | fb7ad0e23e73954e6e5d172d61edb31cd686b8b4 (diff) | |
| parent | 7b019504fd792293f1112b2375228505fab303fe (diff) | |
| download | chouette-core-a7930abe5a70b8b964af0dcbf86fe0a587ea98cb.tar.bz2 | |
Merge branch 'master' into 4981_last_editor
Diffstat (limited to 'app/controllers/stop_areas_controller.rb')
| -rw-r--r-- | app/controllers/stop_areas_controller.rb | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/app/controllers/stop_areas_controller.rb b/app/controllers/stop_areas_controller.rb index 63e2cd97a..133518324 100644 --- a/app/controllers/stop_areas_controller.rb +++ b/app/controllers/stop_areas_controller.rb @@ -64,22 +64,22 @@ class StopAreasController < ChouetteController    def new      authorize resource_class -    @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) -    @map.editable = true +    # @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) +    # @map.editable = true      new!    end    def create      authorize resource_class -    @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) -    @map.editable = true +    # @map = StopAreaMap.new( Chouette::StopArea.new).with_helpers(self) +    # @map.editable = true      create!    end    def show -    map.editable = false -    @access_points = @stop_area.access_points +    # map.editable = false +    # @access_points = @stop_area.access_points      show! do |format|        unless stop_area.position or params[:default] or params[:routing]          format.kml { | 
