diff options
| author | Michel Etienne | 2015-01-26 13:12:24 +0100 |
|---|---|---|
| committer | Michel Etienne | 2015-01-26 13:12:24 +0100 |
| commit | 34dcd6afff1fc8581649cb1b400a66969b0f65ae (patch) | |
| tree | 59132309c796770ce2275e0317e8bb283ab8612f /app/controllers | |
| parent | 657966f57ab15234effcc56d58ff49dace885576 (diff) | |
| parent | c3ed60be997734921c8305f24b78e997e52a9cd3 (diff) | |
| download | chouette-core-34dcd6afff1fc8581649cb1b400a66969b0f65ae.tar.bz2 | |
merge branch V2_5
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/registrations_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/stop_area_copies_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/registrations_controller.rb b/app/controllers/registrations_controller.rb index b02d3217a..f563fbb03 100644 --- a/app/controllers/registrations_controller.rb +++ b/app/controllers/registrations_controller.rb @@ -6,7 +6,7 @@ def accept_user_creation if !Rails.application.config.accept_user_creation - redirect_to root_path + redirect_to unauthenticated_root_path return false else return true diff --git a/app/controllers/stop_area_copies_controller.rb b/app/controllers/stop_area_copies_controller.rb index 7c1fac8d9..fb429595e 100644 --- a/app/controllers/stop_area_copies_controller.rb +++ b/app/controllers/stop_area_copies_controller.rb @@ -18,7 +18,7 @@ class StopAreaCopiesController < ChouetteController @stop_area_copy = StopAreaCopy.new(params[:stop_area_copy]) @stop_area = parent if @stop_area_copy.save - redirect_to referential_stop_area_path( @referential,parent ), notice: I18n.t("stop_area_copies.new.success") + redirect_to referential_stop_area_path( @referential,@stop_area_copy.copy ), notice: I18n.t("stop_area_copies.new.success") else flash[:error] = I18n.t("stop_area_copies.errors.copy_aborted") + "<br>" + @stop_area_copy.errors.full_messages.join("<br>") render :action => :new |