diff options
| author | IN COMMON Collective <collective@incommon.cc> | 2021-04-09 12:29:16 +0200 |
|---|---|---|
| committer | IN COMMON Collective <collective@incommon.cc> | 2021-04-09 12:29:16 +0200 |
| commit | 90c67665394bdd36e86e484020cfbd5ad4f188b2 (patch) | |
| tree | b41e2db43f72c92db88c4bc5069a5323c3488021 /app/controllers | |
| parent | d14700c51d692335f001a93c2f6b13b135783206 (diff) | |
| parent | 4375650ea0788ae6b2a390b10ca6679d67dfc7a3 (diff) | |
| download | incommon-map-main.tar.gz | |
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 |