diff options
| author | Marc Florisson | 2012-05-16 18:25:31 +0200 |
|---|---|---|
| committer | Marc Florisson | 2012-05-16 18:25:31 +0200 |
| commit | 8dd0e3ae02e8c90f3c18224ce0d3dc960bd4b0dc (patch) | |
| tree | 424d30c365561c712a26e368f4dca58e0d074f92 | |
| parent | 70e4f9a603c9e2f7a33f5e2f24966935dd279db8 (diff) | |
| download | chouette-core-8dd0e3ae02e8c90f3c18224ce0d3dc960bd4b0dc.tar.bz2 | |
update ninoxe
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/controllers/stop_points_controller.rb | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 28bd45242..083418f0e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: git://chouette.dryade.priv/ninoxe - revision: f5bceada23c96488b4d830947a7c6eb38bd22d4f + revision: 9deb81a3121fdf295512f875a91ba7b5d0d106a4 specs: ninoxe (0.0.8) GeoRuby @@ -161,7 +161,6 @@ GEM jruby-openssl (0.7.6.1) bouncy-castle-java (>= 1.5.0146.1) jruby-rack (1.1.5) - json (1.7.3) json (1.7.3-java) launchy (2.1.0) addressable (~> 2.2.6) diff --git a/app/controllers/stop_points_controller.rb b/app/controllers/stop_points_controller.rb index ae6bbd09a..bfd229dd7 100644 --- a/app/controllers/stop_points_controller.rb +++ b/app/controllers/stop_points_controller.rb @@ -12,10 +12,9 @@ class StopPointsController < ChouetteController alias_method :route, :parent def sort - begin - route.reorder!( params[:stop_point]) + if route.reorder!( params[:stop_point]) flash[:notice] = t("stop_points.reorder_success") - rescue => e + else flash[:alert] = t("stop_points.reorder_failure") end respond_to do |format| |