diff options
| author | IN COMMON Collective <collective@incommon.cc> | 2021-03-26 15:24:16 +0100 |
|---|---|---|
| committer | IN COMMON Collective <collective@incommon.cc> | 2021-03-26 15:24:16 +0100 |
| commit | 02283fe4979ad055a20131166628a32b3c152897 (patch) | |
| tree | caaa9cb10c6b661f9055b9361392d8cfad53176e /app/controllers | |
| parent | c738e96b2b99bfd92b70d4cec26d6874a7f609e4 (diff) | |
| download | incommon-map-02283fe4979ad055a20131166628a32b3c152897.tar.gz | |
[DEV] WIP: explore sso login alternative
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/welcome_controller.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1eff1a9..25700af 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base require 'sso' + SSO::FromDiscourse.config = Rails.configuration.sso before_action :current_user diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index ad9cd95..d5f5fe9 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -6,7 +6,7 @@ class WelcomeController < ApplicationController # GET / def index @map = Map.first - @taxonomy = @map.taxonomy + @taxonomy = @map&.taxonomy @resources = Resource.order(:uuid).page params[:page] Rails.logger.info "WECLOME ///// #{@resources&.count || 0}" end |