Skip to content

7675 update ds success msgs #7707

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 5 commits into from
Mar 23, 2021
Merged

7675 update ds success msgs #7707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d77f40d
Merge branch 'develop' into 7675-update-ds-success-msgs
sekmiller Mar 18, 2021
24433cf
#7675 add pub reminders to save success messages
sekmiller Mar 19, 2021
fd3b3f1
#7675 remove unused code
sekmiller Mar 19, 2021
6b2a89f
#7675 get standard apostrophe
sekmiller Mar 19, 2021
a3d6e11
Merge branch 'develop' into 7675-update-ds-success-msgs
sekmiller Mar 22, 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
45 changes: 37 additions & 8 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,29 @@ public String getComputeUrl() throws IOException {

}


//get a string to add to save success message
//depends on dataset state and user privleges
private String getReminderString(Dataset dataset) {

//dataset id is null before first save -- needed for create mode
if( dataset.getId() == null || !dataset.isReleased() ){
//messages for draft state.
if (canPublishDataset()){
return BundleUtil.getStringFromBundle("dataset.message.publish.remind.draft");
} else {
return BundleUtil.getStringFromBundle("dataset.message.submit.remind.draft");
}
} else{
//messages for new version - post-publish
if (canPublishDataset()){
return BundleUtil.getStringFromBundle("dataset.message.publish.remind.version");
} else {
return BundleUtil.getStringFromBundle("dataset.message.submit.remind.version");
}
}
}

//For a single file
public String getComputeUrl(FileMetadata metadata) {
SwiftAccessIO swiftObject = null;
Expand Down Expand Up @@ -1280,6 +1303,10 @@ public boolean canUpdateDataset() {
public boolean canPublishDataverse() {
return permissionsWrapper.canIssuePublishDataverseCommand(dataset.getOwner());
}

public boolean canPublishDataset(){
return permissionsWrapper.canIssuePublishDatasetCommand(dataset);
}

public boolean canViewUnpublishedDataset() {
return permissionsWrapper.canViewUnpublishedDataset( dvRequestService.getDataverseRequest(), dataset);
Expand Down Expand Up @@ -3347,6 +3374,8 @@ public String save() {
return "";
}



// Use the Create or Update command to save the dataset:
Command<Dataset> cmd;
Map<Long, String> deleteStorageLocations = null;
Expand Down Expand Up @@ -3450,7 +3479,7 @@ public String save() {
}
if (addFilesSuccess && dataset.getFiles().size() > 0) {
if (nNewFiles == dataset.getFiles().size()) {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess").concat(" ").concat(getReminderString(dataset)));
} else {
String partialSuccessMessage = BundleUtil.getStringFromBundle("dataset.message.createSuccess.partialSuccessSavingFiles");
partialSuccessMessage = partialSuccessMessage.replace("{0}", "" + dataset.getFiles().size() + "");
Expand All @@ -3460,26 +3489,26 @@ public String save() {
} else {
JsfHelper.addWarningMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess.failedToSaveFiles"));
}
} else {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess"));
} else {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.createSuccess").concat(" ").concat(getReminderString(dataset)));
}
}
if (editMode.equals(EditMode.METADATA)) {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.metadataSuccess"));
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.metadataSuccess").concat(" ").concat(getReminderString(dataset)));
}
if (editMode.equals(EditMode.LICENSE)) {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.termsSuccess"));
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.termsSuccess").concat(" ").concat(getReminderString(dataset)));
}
if (editMode.equals(EditMode.FILE)) {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess"));
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.filesSuccess").concat(" ").concat(getReminderString(dataset)));
}

} else {
// must have been a bulk file update or delete:
if (bulkFileDeleteInProgress) {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteSuccess"));
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileDeleteSuccess").concat(" ").concat(getReminderString(dataset)));
} else {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileUpdateSuccess"));
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.bulkFileUpdateSuccess").concat(" ").concat(getReminderString(dataset)));
}
}

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/propertyFiles/Bundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,10 +1403,14 @@ dataset.message.createSuccess.failedToSaveFiles=Partial Success: The dataset has
dataset.message.createSuccess.partialSuccessSavingFiles=Partial Success: The dataset has been created. But only {0} out of {1} files have been saved. Please try uploading the missing file(s) again.
dataset.message.linkSuccess= {0} has been successfully linked to {1}.
dataset.message.metadataSuccess=The metadata for this dataset has been updated.
dataset.message.termsSuccess=The terms for this dataset has been updated.
dataset.message.termsSuccess=The terms for this dataset have been updated.
dataset.message.filesSuccess=The files for this dataset have been updated.
dataset.message.addFiles.Failure=Failed to add files to the dataset. Please try uploading the file(s) again.
dataset.message.addFiles.partialSuccess=Partial success: only {0} files out of {1} have been saved. Please try uploading the missing file(s) again.
dataset.message.publish.remind.draft=If it's ready for sharing, please publish it.
dataset.message.submit.remind.draft=If it's ready for sharing, please submit it for review.
dataset.message.publish.remind.version=If it's ready for sharing, please publish it so that others can see these changes.
dataset.message.submit.remind.version=If it's ready for sharing, please submit it for review so that others can see these changes.
dataset.message.publishSuccess=This dataset has been published.
dataset.message.only.authenticatedUsers=Only authenticated users may release Datasets.
dataset.message.deleteSuccess=This dataset has been deleted.
Expand Down