only render "Other Log In Options" if there is more than one #3338

IQSS · Nov 29, 2016 · a405eb3 · a405eb3
1 parent 2e49d12
commit a405eb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/LoginPage.java b/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
@@ -113,11 +113,7 @@ public void init() {
         }
         authProvider = authSvc.getAuthenticationProvider(provider);
     }
-
-    public boolean isAuthenticationProvidersAvailable() {
-        return ! authSvc.getAuthenticationProviderIds().isEmpty();
-    }
-
+
     public List<AuthenticationProviderDisplayInfo> listCredentialsAuthenticationProviders() {
         List<AuthenticationProviderDisplayInfo> infos = new LinkedList<>();
         for ( String id : authSvc.getAuthenticationProviderIdsOfType( CredentialsAuthenticationProvider.class ) ) {

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
@@ -22,7 +22,7 @@
             <ui:param name="showMessagePanel" value="#{true}"/>
             <ui:param name="loginRedirectPage" value="dataverse.xhtml"/>
             <ui:define name="body">
-                <ui:fragment rendered="#{not LoginPage.authenticationProvidersAvailable}">
+                <ui:fragment rendered="#{LoginPage.listAuthenticationProviders().size() lt 1}">
                     <div class="row">
                         <div class="col-sm-12">
                             <div class="alert alert-danger">
@@ -198,7 +198,7 @@
                                 </div>
                             </div>
 
-                            <div id="otherProviders" jsf:rendered="#{LoginPage.authenticationProvidersAvailable}">
+                            <div id="otherProviders" jsf:rendered="#{LoginPage.listAuthenticationProviders().size() > 1}">
                                 <h4>#{bundle['auth.providers.title']}</h4>
                                 <ui:repeat value="#{LoginPage.listAuthenticationProviders()}" var="provider">
                                     <h:outputLink rendered="#{provider.id != LoginPage.authProvider.id}" styleClass="btn btn-default" value="/loginpage.xhtml?redirectPage=dataverseuser.xhtml&amp;provider=#{provider.id}">