From 2e62aaf0c8afe3515ad9241156b1f7d87d4e7117 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Thu, 19 Dec 2019 03:32:52 -0800 Subject: [PATCH] Tweak devise modules list --- app/models/user.rb | 2 +- app/views/devise/shared/_openid_links.html.haml | 2 +- app/views/devise/shared/_sign_in_form_embedded.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 7c764fa1..1e148579 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -50,7 +50,7 @@ class User < ApplicationRecord else [:database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable, - :omniauthable, omniauth_providers: [:suse, :google, :facebook, :github]] + :omniauthable, omniauth_providers: [:google, :discourse]] end devise(*devise_modules) diff --git a/app/views/devise/shared/_openid_links.html.haml b/app/views/devise/shared/_openid_links.html.haml index 19adf922..6331ad35 100644 --- a/app/views/devise/shared/_openid_links.html.haml +++ b/app/views/devise/shared/_openid_links.html.haml @@ -1,7 +1,7 @@ .text-center .btn-group.btn-group-lg#openid-btn-grp - omniauth_configured.each do |provider| - - if provider == :discourse + - if provider.to_s != :discourse = link_to "user_#{provider}_omniauth_authorize".to_sym, class: "btn btn-success btn-lg", id: "omniauth-#{provider}", title: "Your #{provider} login" do diff --git a/app/views/devise/shared/_sign_in_form_embedded.html.haml b/app/views/devise/shared/_sign_in_form_embedded.html.haml index dc719616..9a82b188 100644 --- a/app/views/devise/shared/_sign_in_form_embedded.html.haml +++ b/app/views/devise/shared/_sign_in_form_embedded.html.haml @@ -1,5 +1,5 @@ - if ENV['OSEM_ICHAIN_ENABLED'] != 'true' - .container + .container.panel = form_tag(new_user_session_path, class: '') do %legend %span