From 729e0a9cc8e825bcacb49427afe11148eb26de3b Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Wed, 19 Jun 2019 11:52:50 -0400
Subject: [PATCH 1/7] Added request access popup to file pg [ref #4897]

---
 src/main/webapp/file.xhtml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index db6a0940b79..78f3db93a87 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -554,7 +554,12 @@
                                 #{bundle.cancel}
                             </button>
                         </div>
-                    </p:dialog>
+                    </p:dialog><ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
+                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
+                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
+                            <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
+                            <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
+                            <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
                     <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
                          <ui:include src="file-download-popup-fragment.xhtml">
                             <ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
@@ -583,7 +588,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">

From 891a2fc14ea4ba9277a02e28acd86b762d810fd0 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 24 Jun 2019 15:39:03 -0400
Subject: [PATCH 2/7] Changed button back to p:commandLink component to fix
 rogue popup btns on dataset pg [ref 5958]

---
 src/main/webapp/dataset-versions.xhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index 0d716b0d2a9..308a59e35ed 100644
--- a/src/main/webapp/dataset-versions.xhtml
+++ b/src/main/webapp/dataset-versions.xhtml
@@ -34,10 +34,10 @@
            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}">
+        <p:commandLink styleClass="btn btn-default" onclick="testCheckBoxes();"
+                         rendered="#{DatasetPage.compareVersionsCount > 2}">
             <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
-        </button>
+        </p:commandLink>
         <p:commandButton value="#{bundle['file.dataFilesTab.button.direct']}" id="compareVersions"
                          style="display:none"
                          update=":datasetForm"

From 2fe199798507f414b4da306af5feb1423a196212 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Mon, 24 Jun 2019 15:51:42 -0400
Subject: [PATCH 3/7] adds "if exists" to the "drop column" statements in the
 flyway script for the gbr split. #5964

---
 .../resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index b161a093497..235067d3fe7 100644
--- 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
@@ -1,4 +1,4 @@
 begin;
 insert into filedownload(GUESTBOOKRESPONSE_ID,DOWNLOADTYPE,DOWNLOADTIMESTAMP,SESSIONID) select ID, DOWNLOADTYPE,RESPONSETIME,SESSIONID from guestbookresponse;
-alter table guestbookresponse drop column DOWNLOADTYPE, drop column SESSIONID;
+alter table guestbookresponse drop column if exists  DOWNLOADTYPE, drop column if exists SESSIONID;
 commit;

From c1f533a697b92191f9974cde3354229fcdf029a8 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Mon, 24 Jun 2019 15:54:27 -0400
Subject: [PATCH 4/7] Also, renamed the flyway script, since the current
 version is 4.15 already! (#5964)

---
 ...43-split-gbr-table.sql => V4.15.0.1__2043-split-gbr-table.sql} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/main/resources/db/migration/{V4.14.0.2__2043-split-gbr-table.sql => V4.15.0.1__2043-split-gbr-table.sql} (100%)

diff --git a/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql b/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql
similarity index 100%
rename from src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql
rename to src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql

From 08858f8dfcb1481c443e55f87abd956789ddb6e5 Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Mon, 24 Jun 2019 16:35:43 -0400
Subject: [PATCH 5/7] Fixed render logic for buttons on dataset pg to remove
 problematic jsf:rendered attributes [ref #5958]

---
 src/main/webapp/dataset-versions.xhtml |  9 +++----
 src/main/webapp/dataset.xhtml          | 33 +++++++++++++-------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index 308a59e35ed..7be90d3d90e 100644
--- 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">
-        <p:commandLink styleClass="btn btn-default" onclick="testCheckBoxes();"
-                         rendered="#{DatasetPage.compareVersionsCount > 2}">
-            <span class="glyphicon glyphicon-transfer"/> #{bundle['file.dataFilesTab.versions.viewDiffBtn']}
-        </p:commandLink>
+        <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
index 9bb29fc8957..19c71477c14 100644
--- 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 -->
                                 

From f5924cd5adc0ab7aadbbc8feaf76d1057c202a2f Mon Sep 17 00:00:00 2001
From: Michael Heppler <mheppler@hmdc.harvard.edu>
Date: Tue, 25 Jun 2019 13:38:31 -0400
Subject: [PATCH 6/7] Removed unintentionally pasted code snippet from file pg
 [ref #4897]

---
 src/main/webapp/file.xhtml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 78f3db93a87..f04a370e231 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -554,12 +554,7 @@
                                 #{bundle.cancel}
                             </button>
                         </div>
-                    </p:dialog><ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>
-                            <ui:param name="downloadPopupRequired" value="#{FilePage.downloadPopupRequired}"/>
-                            <ui:param name="guestbookResponse" value="#{FilePage.guestbookResponse}"/>
-                            <ui:param name="guestbookResponseService" value="#{FilePage.guestbookResponseService}"/>
-                            <ui:param name="fileDownloadService" value="#{FilePage.fileDownloadService}"/>
-                            <ui:param name="lockedFromDownload" value="#{FilePage.lockedFromDownload}"/>
+                    </p:dialog>
                     <p:dialog id="downloadPopup" styleClass="largePopUp" header="#{bundle['file.downloadDialog.header']}" widgetVar="downloadPopup" modal="true">
                          <ui:include src="file-download-popup-fragment.xhtml">
                             <ui:param name="workingVersion" value="#{FilePage.fileMetadata.datasetVersion}"/>

From 1fcb06540e139df5fe9f9f14878c5841a8f33b4a Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Tue, 25 Jun 2019 16:15:13 -0400
Subject: [PATCH 7/7] more (hopefully, last?) fixes for the flyway script.
 (#5964)

---
 .../migration/V4.15.0.1__2043-split-gbr-table.sql  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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
index 235067d3fe7..adde91ee1b0 100644
--- 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
@@ -1,4 +1,10 @@
-begin;
-insert into filedownload(GUESTBOOKRESPONSE_ID,DOWNLOADTYPE,DOWNLOADTIMESTAMP,SESSIONID) select ID, DOWNLOADTYPE,RESPONSETIME,SESSIONID from guestbookresponse;
-alter table guestbookresponse drop column if exists  DOWNLOADTYPE, drop column if exists SESSIONID;
-commit;
+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
+$$
+
+