diff options
| author | Teddy Wing | 2017-06-19 11:03:34 +0200 |
|---|---|---|
| committer | Teddy Wing | 2017-06-19 11:03:34 +0200 |
| commit | a6b84e751068da4cce61aec75690a2d1ea295b13 (patch) | |
| tree | 1ccfbf2bbdc9065cf75b1017881cf6fecd9feb0b /app/controllers | |
| parent | 88f1d1c6c4dd82404c124ec15ab56513289c2210 (diff) | |
| parent | 9ef3d205aa091d509455b3607d5ecc74431c6196 (diff) | |
| download | chouette-core-a6b84e751068da4cce61aec75690a2d1ea295b13.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into 3479-refactor-table_builder-helper
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/devise/cas_sessions_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/referentials_controller.rb | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/app/controllers/devise/cas_sessions_controller.rb b/app/controllers/devise/cas_sessions_controller.rb index 3b16603b9..0a9d9ecb2 100644 --- a/app/controllers/devise/cas_sessions_controller.rb +++ b/app/controllers/devise/cas_sessions_controller.rb @@ -20,7 +20,7 @@ class Devise::CasSessionsController < Devise::SessionsController if LoginPolicy.new(current_user).boiv? redirect_to after_sign_in_path_for(current_user) else - redirect_to cas_login_url, flash: {alert: t('devise.sessions.new.unauthorized')} + redirect_to root_path, flash: {alert: t('devise.sessions.new.unauthorized')} end end diff --git a/app/controllers/referentials_controller.rb b/app/controllers/referentials_controller.rb index e95670241..1239d512f 100644 --- a/app/controllers/referentials_controller.rb +++ b/app/controllers/referentials_controller.rb @@ -76,7 +76,6 @@ class ReferentialsController < BreadcrumbController alias_method :current_referential, :referential helper_method :current_referential - def resource @referential ||= current_organisation.find_referential(params[:id]) end @@ -132,13 +131,7 @@ class ReferentialsController < BreadcrumbController params.require(:referential).permit( :id, :name, - :slug, - :prefix, - :time_zone, - :upper_corner, - :lower_corner, :organisation_id, - :projection_type, :data_format, :archived_at, :created_from_id, |
