lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/greenlight

This commit is contained in:
jfederico 2019-05-01 20:54:36 +00:00
parent 63a6cdb28b 4896133d58
commit 8e731e878b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/sessions_helper.rb
View File

@ -33,7 +33,7 @@ module SessionsHelper
def check_email_verified(user) def check_email_verified(user)
if user.activated? if user.activated?
# Get the url to redirect the user to # Get the url to redirect the user to
url = if cookies[:return_to] && cookies[:return_to] != root_url url = if cookies[:return_to] && ![root_url, signup_url].include?(cookies[:return_to])
cookies[:return_to] cookies[:return_to]
else else
user.main_room user.main_room

4
app/views/shared/_header.html.erb
View File

@ -62,8 +62,10 @@
<%= link_to t("login"), omniauth_login_url(:ldap), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %> <%= link_to t("login"), omniauth_login_url(:ldap), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %>
<% elsif allow_greenlight_accounts %> <% elsif allow_greenlight_accounts %>
<%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %> <%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %>
<% else %> <% elsif Rails.configuration.loadbalanced_configuration %>
<%= link_to t("login"), omniauth_login_url(:bn_launcher), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %> <%= link_to t("login"), omniauth_login_url(:bn_launcher), :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button" %>
<% else %>
<%= link_to t("login"), "#loginModal", :class => "btn btn-pill btn-outline-primary mx-2 sign-in-button", "data-toggle": "modal" %>
<% end %> <% end %>
<% if allow_user_signup? && allow_greenlight_accounts %> <% if allow_user_signup? && allow_greenlight_accounts %>