Skip to content

Commit

Permalink
#2290 remove extra line; fix spacing
Browse files Browse the repository at this point in the history
  • Loading branch information
sekmiller committed Jan 27, 2017
1 parent 64eeecd commit cf92022
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1781,7 +1781,6 @@ public void handleFileUpload(FileUploadEvent event) throws IOException {
RequestContext context = RequestContext.getCurrentInstance();
RequestContext.getCurrentInstance().update("datasetForm:fileTypeDifferentPopup");
context.execute("PF('fileTypeDifferentPopup').show();");
context.execute("PF('fileTypeDifferentPopup').show();");
}
return;

Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/file.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@
and !(dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile))}">
<span class="glyphicon glyphicon-pencil"/> #{bundle['file.dataFilesTab.metadata.addBtn']}
</h:outputLink>
<div class="btn-group pull-right" jsf:rendered="#{dataverseSession.user.authenticated
<div class="btn-group" jsf:rendered="#{dataverseSession.user.authenticated
and permissionsWrapper.canIssueUpdateDatasetCommand(FilePage.fileMetadata.datasetVersion.dataset)
and (dataFileServiceBean.hasReplacement(FilePage.fileMetadata.dataFile) or dataFileServiceBean.hasBeenDeleted(FilePage.fileMetadata.dataFile)) }">
<p:commandLink styleClass="btn btn-default" onclick="PF('fileAlreadyReplacedPrevious').show()">
Expand Down

0 comments on commit cf92022

Please sign in to comment.