Skip to content

Commit 7e385bb

Browse files
committed
Closes #2393: Fix add dataset button visibility on installations with required email confirmation
1 parent 57ed6a1 commit 7e385bb

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.net.URLDecoder;
2525
import java.util.ArrayList;
2626
import java.util.List;
27-
import java.util.UUID;
2827
import java.util.function.Function;
2928
import java.util.logging.Level;
3029
import java.util.logging.Logger;
@@ -109,10 +108,14 @@ public void initBreadcrumbsForDataFile(DataFile datafile, String subPage) {
109108
initBreadcrumbsForFileMetadata(fmd, subPage);
110109
}
111110

112-
public Boolean shouldShowUnconfirmedMailInfoBanner() {
111+
public boolean shouldShowUnconfirmedMailInfoBanner() {
113112
return confirmEmailService.hasEffectivelyUnconfirmedMail(dataverseSession.getUser());
114113
}
115114

115+
public boolean shouldShowAddDatasetButton() {
116+
return dataverseSession.getUser().isAuthenticated() && !confirmEmailService.hasEffectivelyUnconfirmedMail(dataverseSession.getUser());
117+
}
118+
116119
public void initBreadcrumbsForFileMetadata(FileMetadata fmd, String subPage) {
117120
if (fmd == null) {
118121
return;

dataverse-webapp/src/main/resources/config/dataverse.default.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ AntivirusScannerSocketAddress=localhost
150150
AntivirusScannerSocketPort=3310
151151
AntivirusScannerSocketTimeout=60000
152152

153-
UnconfirmedMailRestrictionModeEnabled=false
153+
UnconfirmedMailRestrictionModeEnabled=true
154154

155155
FilesIntegrityCheckTimerExpression=0 0 1 * *
156156

dataverse-webapp/src/main/webapp/dataverse_header.xhtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
<div class="main-menu-container">
159159
<nav class="main-menu">
160160
<ul class="nav navbar-nav">
161-
<li jsf:rendered="#{dataverseSession.user.authenticated}">
161+
<li jsf:rendered="#{dataverseHeaderFragment.shouldShowAddDatasetButton()}">
162162
<h:form styleClass="navbar-form navbar-left navbar-form-link navbar-highlighted-link">
163163
<p:commandLink action="#{CreateDatasetDialog.init()}" update="create-dataset-dialog"
164164
oncomplete="primeFacesShowModal('createDatasetDialog', this)">

0 commit comments

Comments
 (0)