Skip to content

prevent page from blowing up if no remind msg in bundle #7975 #7985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kcondon merged 2 commits into from
Jul 6, 2021
Merged

prevent page from blowing up if no remind msg in bundle #7975 #7985

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
375bf82
prevent page from blowing up if no remind msg in bundle #7975
pdurbin Jun 30, 2021
6428c34
Merge branch 'develop' into 7975-remind #7975
pdurbin Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,21 +732,30 @@ public void exportAllDatasets(boolean forceReExport) {
//depends on dataset state and user privleges
public String getReminderString(Dataset dataset, boolean canPublishDataset) {

String reminderString;

if(!dataset.isReleased() ){
//messages for draft state.
if (canPublishDataset){
return BundleUtil.getStringFromBundle("dataset.message.publish.remind.draft");
reminderString = BundleUtil.getStringFromBundle("dataset.message.publish.remind.draft");
} else {
return BundleUtil.getStringFromBundle("dataset.message.submit.remind.draft");
reminderString = BundleUtil.getStringFromBundle("dataset.message.submit.remind.draft");
}
} else{
//messages for new version - post-publish
if (canPublishDataset){
return BundleUtil.getStringFromBundle("dataset.message.publish.remind.version");
reminderString = BundleUtil.getStringFromBundle("dataset.message.publish.remind.version");
} else {
return BundleUtil.getStringFromBundle("dataset.message.submit.remind.version");
reminderString = BundleUtil.getStringFromBundle("dataset.message.submit.remind.version");
}
}

if (reminderString != null) {
return reminderString;
} else {
logger.warning("Unable to get reminder string from bundle. Returning empty string.");
return "";
}
}

public void updateLastExportTimeStamp(Long datasetId) {
Expand Down