Merge branch 'develop' into 4448-api-edit-var-meta-pdurbin-code-review …

…#4448 Add pull request #5966 so the war file deploys
IQSS · Jun 28, 2019 · a6e0b4a · a6e0b4a
2 parents c9cca81 + 2f477c9
commit a6e0b4a
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 25 deletions.
diff --git a/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql b/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql
diff --git a/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql b/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql
@@ -0,0 +1,10 @@
+DO $$
+BEGIN
+IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='guestbookresponse' AND column_name='downloadtype') THEN
+   INSERT INTO filedownload(guestbookresponse_id, downloadtype, downloadtimestamp, sessionid) SELECT id, downloadtype, responsetime, sessionid FROM guestbookresponse;
+   ALTER TABLE guestbookresponse DROP COLUMN downloadtype, DROP COLUMN sessionid;
+END IF;
+END
+$$
+
+
diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
@@ -34,10 +34,11 @@
            update=":#{p:resolveClientId('datasetForm:tabView:versionsTable', view)}"
            actionListener="#{DatasetPage.postLoadSetVersionTabList()}" />
     <div class="text-right margin-bottom">
-        <button type="button" class="btn btn-default" onclick="testCheckBoxes();"
-                         jsf:rendered="#{DatasetPage.compareVersionsCount > 2}">
-            <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
-        </button>
+        <ui:fragment rendered="#{DatasetPage.compareVersionsCount > 2}">
+            <button type="button" class="btn btn-default" onclick="testCheckBoxes();">
+                <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
+            </button>
+        </ui:fragment>
         <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
                          style="display:none"
                          update=":datasetForm"

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -177,28 +177,29 @@
                                         <span class="glyphicon glyphicon-globe"/> #{bundle['dataset.publish.btn']}
                                     </p:commandLink>
                                     <!-- END: Publish Buttons -->
-
-                                    <!-- Return to Author Button -->
-                                    <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
-                                                          onclick="PF('sendBackToContributor').show()"
-                                                          jsf:rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
+
+                                    <ui:fragment rendered="#{DatasetPage.dataset.latestVersion.versionState=='DRAFT' and DatasetPage.dataset.latestVersion.inReview
                                                                and permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
-                                    </button>
-                                    <!-- END: Return to Author Button -->
+                                        <!-- Return to Author Button -->
+                                        <button type="button" class="btn btn-default btn-access #{(DatasetPage.locked and !DatasetPage.dataset.latestVersion.inReview) ? 'disabled' : ''}" 
+                                                              onclick="PF('sendBackToContributor').show()">
+                                            <span class="glyphicon glyphicon-repeat"/> #{bundle['dataset.rejectBtn']}
+                                        </button>
+                                        <!-- END: Return to Author Button -->
+                                    </ui:fragment>
 
-                                    <!-- Submit for Review Button -->
-                                    <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
-                                                          onclick="PF('inreview').show()"
-                                                          jsf:rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
+                                    <ui:fragment rendered="#{DatasetPage.workingVersion == DatasetPage.dataset.latestVersion
                                                             and !DatasetPage.datasetLockedInWorkflow
                                                             and DatasetPage.dataset.latestVersion.versionState=='DRAFT'
                                                             and DatasetPage.canUpdateDataset()
                                                             and !permissionsWrapper.canIssuePublishDatasetCommand(DatasetPage.dataset)}">
-                                        <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
-                                    </button>
-
-                                    <!-- End: Submit for Review Button -->
+                                        <!-- Submit for Review Button -->
+                                        <button type="button" class="btn btn-default btn-access #{DatasetPage.dataset.latestVersion.inReview or DatasetPage.dataset.locked ? 'disabled' : ''}" 
+                                                              onclick="PF('inreview').show()">
+                                            <span class="glyphicon glyphicon-globe"/> #{DatasetPage.dataset.latestVersion.inReview ? bundle['dataset.disabledSubmittedBtn'] : bundle['dataset.submitBtn']}
+                                        </button>
+                                        <!-- End: Submit for Review Button -->
+                                    </ui:fragment>
                                 </ui:fragment>
                                 <!-- END: Publish/Submit for Review/Return to Author Button Group -->
 

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
@@ -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">