Skip to content
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

Jump to bottom

4403 guest publish msgs #5363

Merged
merged 5 commits into from Dec 19, 2018
Merged

4403 guest publish msgs #5363

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
e527f60
Added render logic to fix dataset lock msgs displaying to users witho…
mheppler Dec 3, 2018
dd46c27
Merge branch 'develop' into 4403-guest-publish-msgs
mheppler Dec 3, 2018
3eb00e2
Updated dataset lock warning msgs based on feedback [ref #4403]
mheppler Dec 4, 2018
852f8ef
Merge branch 'develop' into 4403-guest-publish-msgs
sekmiller Dec 18, 2018
e836d07
#4403 typo in search include fragment
sekmiller Dec 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/main/java/Bundle.properties
View file
Open in desktop
Expand Up @@ -1184,7 +1184,7 @@ dataset.submitBtn=Submit for Review
dataset.disabledSubmittedBtn=Submitted for Review
dataset.submitMessage=You will not be able to make changes to this dataset while it is in review.
dataset.submit.success=Your dataset has been submitted for review.
dataset.inreview.infoMessage=\u2013 This dataset is currently under review prior to publication.
dataset.inreview.infoMessage=The draft version of this dataset is currently under review prior to publication.
dataset.submit.failure=Dataset Submission Failed - {0}
dataset.submit.failure.null=Can't submit for review. Dataset is null.
dataset.submit.failure.isReleased=Latest version of dataset is already released. Only draft versions can be submitted for review.
Expand Down Expand Up @@ -1220,6 +1220,7 @@ dataset.share.datasetShare=Share Dataset
dataset.share.datasetShare.tip=Share this dataset on your favorite social media networks.
dataset.share.datasetShare.shareText=View this dataset.
dataset.locked.message=Dataset Locked
dataset.locked.message.details=This dataset is locked until publication.
dataset.locked.inReview.message=Submitted for Review
dataset.publish.error=This dataset may not be published due to an error when contacting the <a href=\{1} target=\"_blank\"/> {0} </a> Service. Please try again.
dataset.publish.error.doi=This dataset may not be published because the DOI update failed.
Expand All @@ -1236,8 +1237,9 @@ dataset.compute.computeBatchListHeader=Compute Batch
dataset.compute.computeBatchRestricted=This dataset contains restricted files you may not compute on because you have not been granted access.
dataset.delete.error=Could not deaccession the dataset because the {0} update failed.
dataset.publish.worldMap.deleteConfirm=Please note that your data and map on WorldMap will be removed due to restricted file access changes in this dataset version which you are publishing. Do you want to continue?
dataset.publish.workflow.inprogress=Publish workflow in progress
dataset.pidRegister.workflow.inprogress=Register/update file persistent identifiers workflow in progress
dataset.publish.workflow.message=Publish in Progress
dataset.publish.workflow.inprogress=This dataset is locked until publication.
dataset.pidRegister.workflow.inprogress=This dataset is locked while the file persistent identifiers are being registered or updated.
dataset.versionUI.draft=Draft
dataset.versionUI.inReview=In Review
dataset.versionUI.unpublished=Unpublished
Expand Down Expand Up @@ -1401,8 +1403,8 @@ file.rsyncUpload.step2=Download this file upload script:
file.rsyncUpload.step2.downloadScriptButton=Download DCM Script
file.rsyncUpload.step3=Open a terminal window in the same directory you saved the script and run this command: <code>bash ./{0}</code>
file.rsyncUpload.step4=Follow the instructions in the script. It will ask for a full path (beginning with "/") to the directory containing your data. Note: this script will expire after 7 days.
file.rsyncUpload.inProgressMessage.summary=DCM File Upload
file.rsyncUpload.inProgressMessage.details=This dataset is locked until the data files have been transferred and verified.
file.rsyncUpload.inProgressMessage.summary=File Upload in Progress
file.rsyncUpload.inProgressMessage.details=This dataset is locked while the data files are being transferred and verified.
file.rsyncUpload.httpUploadDisabledDueToRsyncFileExisting=HTTP upload is disabled for this dataset because you have already uploaded files via rsync. If you would like to switch to HTTP upload, please contact {0}.
file.rsyncUpload.httpUploadDisabledDueToRsyncFileExistingAndPublished=HTTP upload is disabled for this dataset because you have already uploaded files via rsync and published the dataset.
file.rsyncUpload.rsyncUploadDisabledDueFileUploadedViaHttp=Upload with rsync + SSH is disabled for this dataset because you have already uploaded files via HTTP. If you would like to switch to rsync upload, then you must first remove all uploaded files from this dataset. Once this dataset is published, the chosen upload method is permanently locked in.
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
View file
Open in desktop
Expand Up @@ -1552,10 +1552,10 @@ private String init(boolean initFull) {
}

// Various info messages, when the dataset is locked (for various reasons):
if (dataset.isLocked()) {
if (dataset.isLocked() && canUpdateDataset()) {
if (dataset.isLockedFor(DatasetLock.Reason.Workflow)) {
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"),
BundleUtil.getStringFromBundle("dataset.publish.workflow.inprogress"));
BundleUtil.getStringFromBundle("dataset.locked.message.details"));
}
if (dataset.isLockedFor(DatasetLock.Reason.InReview)) {
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.inReview.message"),
Expand All @@ -1573,8 +1573,8 @@ private String init(boolean initFull) {
datasetService.removeDatasetLocks(dataset.getId(), DatasetLock.Reason.pidRegister);
}*/
if (dataset.isLockedFor(DatasetLock.Reason.pidRegister)) {
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.pidRegister.workflow.inprogress"),
BundleUtil.getStringFromBundle("dataset.publish.workflow.inprogress"));
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.publish.workflow.message"),
BundleUtil.getStringFromBundle("dataset.pidRegister.workflow.inprogress"));
}
}

Expand Down Expand Up @@ -1943,7 +1943,7 @@ private String releaseDataset(boolean minor) {
if ( result.isCompleted() ) {
JsfHelper.addSuccessMessage(BundleUtil.getStringFromBundle("dataset.message.publishSuccess"));
} else {
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"), BundleUtil.getStringFromBundle("dataset.publish.workflow.inprogress"));
JH.addMessage(FacesMessage.SEVERITY_WARN, BundleUtil.getStringFromBundle("dataset.locked.message"), BundleUtil.getStringFromBundle("dataset.locked.message.details"));
}

} catch (CommandException ex) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/search-include-fragment.xhtml
View file
Open in desktop
Expand Up @@ -507,7 +507,7 @@
<h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{SearchIncludeFragment.debug == true}"/></a>

<h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
<h:outputText value="#{bundle['dataset.versionUI.inreview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
<h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
<h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
<h:outputText value="#{bundle['dataset.versionUI.deaccessioned']}" styleClass="label label-danger" rendered="#{result.deaccessionedState}"/>
<h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
Expand Down Expand Up @@ -573,7 +573,7 @@
<h:outputText value="#{result.nameHighlightSnippet}" style="padding:4px 0;" rendered="#{result.nameHighlightSnippet != null}" escape="false"/>
<h:outputText value=" (#{result.entityId})" style="padding:4px 0;" rendered="#{SearchIncludeFragment.debug == true}"/></a>
<h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{result.draftState}"/>
<h:outputText value="#{bundle['dataset.versionUI.inreview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
<h:outputText value="#{bundle['dataset.versionUI.inReview']}" styleClass="label label-success" rendered="#{result.inReviewState}"/>
<h:outputText value="#{bundle['dataset.versionUI.unpublished']}" styleClass="label label-warning" rendered="#{result.unpublishedState}"/>
<h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
</div>
Expand Down