Skip to content

Commit e7c3448

Browse files
committed
show draft/unpublished in UI
1 parent 68a8999 commit e7c3448

4 files changed

Lines changed: 20 additions & 1 deletion

File tree

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
File level permissions: Restricted files in Draft will now show a "Draft/Unpublished" tag in the UI when granting file access
2+
3+
See #7618

src/main/java/edu/harvard/iq/dataverse/DataFile.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,18 @@ public Boolean getDeleted() {
303303
public void setDeleted(Boolean deleted) {
304304
this.deleted = deleted;
305305
}
306-
306+
307+
@Transient
308+
private boolean unpublished;
309+
310+
public boolean getUnpublished() {
311+
return unpublished;
312+
}
313+
314+
public void setUnpublished(boolean unpublished) {
315+
this.unpublished = unpublished;
316+
}
317+
307318
/*
308319
For use during file upload so that the user may delete
309320
files that have already been uploaded to the current dataset version
@@ -596,7 +607,10 @@ public FileMetadata getLatestFileMetadata() {
596607
FileMetadata resultFileMetadata = null;
597608

598609
if (fileMetadatas.size() == 1) {
610+
setUnpublished(fileMetadatas.get(0).getDatasetVersion() == null || fileMetadatas.get(0).getDatasetVersion().getVersionState().equals(VersionState.DRAFT));
599611
return fileMetadatas.get(0);
612+
} else {
613+
setUnpublished(false); // Since only one can be in Draft assume there is a published version
600614
}
601615

602616
for (FileMetadata fileMetadata : fileMetadatas) {

src/main/java/propertyFiles/Bundle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,6 +1241,7 @@ dataverse.permissionsFiles.files.invalidMsg=There are no restricted files in thi
12411241
dataverse.permissionsFiles.files.requested=Requested Files
12421242
dataverse.permissionsFiles.files.selected=Selecting {0} of {1} {2}
12431243
dataverse.permissionsFiles.files.includeDeleted=Include Deleted Files
1244+
dataverse.permissionsFiles.files.draftUnpublished=Draft/Unpublished
12441245
dataverse.permissionsFiles.viewRemoveDialog.header=File Access
12451246
dataverse.permissionsFiles.viewRemoveDialog.removeBtn=Remove Access
12461247
dataverse.permissionsFiles.viewRemoveDialog.removeBtn.confirmation=Are you sure you want to remove access to this file? Once access has been removed, the user or group will no longer be able to download this file.

src/main/webapp/permissions-manage-files.xhtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@
335335
<h:outputText rendered="#{!empty file.directoryLabel}" value="#{file.directoryLabel}/" styleClass="text-muted"/>
336336
<h:outputText value="#{file.displayName}"/>
337337
<h:outputText value=" (#{bundle['dataverse.permissionsFiles.files.deleted']}) " rendered="#{file.deleted}"/>
338+
<h:outputText value=" (#{bundle['dataverse.permissionsFiles.files.draftUnpublished']}) " rendered="#{file.unpublished}"/>
338339
</p:column>
339340
</p:dataTable>
340341
</div>

0 commit comments

Comments
 (0)