Skip to content

Added request access popup to file pg [ref #4897] #5956

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 3 commits into from
Jun 25, 2019
Merged

Added request access popup to file pg [ref #4897] #5956

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
729e0a9
Added request access popup to file pg [ref #4897]
mheppler Jun 19, 2019
f5924cd
Removed unintentionally pasted code snippet from file pg [ref #4897]
mheppler Jun 25, 2019
ab03bb2
Merge branch 'develop' into 4897-file-pg-request-access-fix
mheppler Jun 25, 2019
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
8 changes: 7 additions & 1 deletion src/main/webapp/file.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,13 @@
<ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
</ui:include>
</p:dialog>

<p:dialog id="requestAccessPopup" styleClass="largePopUp" header="#{bundle['file.requestAccess']}" widgetVar="requestAccessPopup" modal="true">
<o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />
<ui:include src="file-request-access-popup-fragment.xhtml">
<ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
<ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
</ui:include>
</p:dialog>
<p:dialog id="configureToolPopup" styleClass="smallPopUp" header="#{configureFragmentBean.configurePopupToolHandler.externalTool.displayName}" widgetVar="configureToolPopup" modal="true"
rendered="#{dataverseSession.user.authenticated and FilePage.canUpdateDataset()}">
<ui:include src="file-configure-popup-fragment.xhtml">
Expand Down