From b03b1637536932fb46eb15067ea522b412d153e3 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 13 Jan 2020 11:36:03 -0500
Subject: [PATCH 1/2] #6504 fix lock refresh

---
 src/main/webapp/dataset.xhtml | 85 ++++++++++++++++++-----------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index e67139a1941..dd77154aedf 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -628,6 +628,50 @@
                             <p:remoteCommand name="refreshAllCommand" process="@this" update=":datasetForm:topDatasetBlockFragment,:datasetForm:tabView:filesTable,:messagePanel" action="#{DatasetPage.refresh()}"/>
                             <!-- see the comment in the javascript below that explains what this button is for -->
                             <p:commandButton id="refreshButton" process="@this" widgetVar="refreshButton" update=":datasetForm:topDatasetBlockFragment,:datasetForm:tabView:filesTable" style="display:none"/>
+                            <script>
+                                
+                                // javascript for refreshing page when locks
+                                $(this).ready(function () {
+                                    refreshIfStillLocked();
+                                });
+                                function refreshIfStillLocked() {
+                                    if ($('input[id$="datasetLockedForAnyReasonVariable"]').val() === 'true') {
+                                        // if dataset is locked, instruct the page to
+                                        // wait and check again:
+                                        waitAndCheckLockAgain();
+                                    } else {
+                                        // if not locked, has it just been unlocked?
+                                        if ($('input[id$="datasetStateChangedVariable"]').val() === 'true') {
+                                            // For whatever unknown PrimeFaces reason
+                                            // the page needs to be refreshed twice, for all
+                                            // the pull down menus to update properly:
+                                            refreshAllCommand();
+                                            // You can't just run 2 refreshAllCommand()s in a row
+                                            // either; because the command has an "update=@all" on it,
+                                            // so I guess if you try to execute the 2nd one right after
+                                            // the first one, this fragment is still going to be loading -
+                                            // so there would not yet be a command to run! (it needs to
+                                            // be rendered, before you can execute it, that is)
+                                            setTimeout(function () {
+                                                // this button doesn't do anything, but it has an update="@all"
+                                                // attribute:
+                                                $('button[id$="refreshButton"]').trigger('click');
+                                                //refreshAllCommand();
+                                            }, 1500);
+                                        }
+                                    }
+                                }
+                                function waitAndCheckLockAgain() {
+                                    setTimeout(function () {
+                                        // refresh the lock in the
+                                        // backing bean; i.e., check, if the ingest has
+                                        // already completed in the background:
+                                        //$('button[id$="refreshButton"]').trigger('click');
+                                        //refreshLockCommand();
+                                        refreshAllLocksCommand();
+                                    }, 10000);
+                                }
+                            </script>
                         </p:fragment>
                         <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!DatasetPage.workingVersion.deaccessioned and (DatasetPage.editMode == 'CREATE')}">
                             <ui:include src="editFilesFragment.xhtml">
@@ -1672,47 +1716,6 @@
                         $('button[id$="updateOwnerDataverse"]').trigger('click');
                     }
 
-                    // javascript for refreshing page when locks
-                    $(this).ready(function () {
-                        refreshIfStillLocked();
-                    });
-                    function refreshIfStillLocked() {
-                        if ($('input[id$="datasetLockedForAnyReasonVariable"]').val() === 'true') {
-                            // if dataset is locked, instruct the page to
-                            // wait and check again:
-                            waitAndCheckLockAgain();
-                        } else {
-                            // if not locked, has it just been unlocked?
-                            if ($('input[id$="datasetStateChangedVariable"]').val() === 'true') {
-                                // For whatever unknown PrimeFaces reason
-                                // the page needs to be refreshed twice, for all
-                                // the pull down menus to update properly:
-                                refreshAllCommand();
-                                // You can't just run 2 refreshAllCommand()s in a row
-                                // either; because the command has an "update=@all" on it,
-                                // so I guess if you try to execute the 2nd one right after
-                                // the first one, this fragment is still going to be loading -
-                                // so there would not yet be a command to run! (it needs to
-                                // be rendered, before you can execute it, that is)
-                                setTimeout(function () {
-                                    // this button doesn't do anything, but it has an update="@all"
-                                    // attribute:
-                                    $('button[id$="refreshButton"]').trigger('click');
-                                    //refreshAllCommand();
-                                }, 1500);
-                            }
-                        }
-                    }
-                    function waitAndCheckLockAgain() {
-                        setTimeout(function () {
-                            // refresh the lock in the
-                            // backing bean; i.e., check, if the ingest has
-                            // already completed in the background:
-                            //$('button[id$="refreshButton"]').trigger('click');
-                            //refreshLockCommand();
-                            refreshAllLocksCommand();
-                        }, 10000);
-                    }
                     //]]>
                 </script>
 

From 7efea0eb339af036d68928c09519f93e942ef3a8 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Mon, 13 Jan 2020 13:20:01 -0500
Subject: [PATCH 2/2] #6504 add back CDATA tags

---
 src/main/webapp/dataset.xhtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index dd77154aedf..57e7bc2f602 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -629,7 +629,7 @@
                             <!-- see the comment in the javascript below that explains what this button is for -->
                             <p:commandButton id="refreshButton" process="@this" widgetVar="refreshButton" update=":datasetForm:topDatasetBlockFragment,:datasetForm:tabView:filesTable" style="display:none"/>
                             <script>
-                                
+                            //<![CDATA[    
                                 // javascript for refreshing page when locks
                                 $(this).ready(function () {
                                     refreshIfStillLocked();
@@ -671,6 +671,7 @@
                                         refreshAllLocksCommand();
                                     }, 10000);
                                 }
+                            //]]>
                             </script>
                         </p:fragment>
                         <ui:fragment id="uploadFilesOnCreateTab" rendered="#{!DatasetPage.workingVersion.deaccessioned and (DatasetPage.editMode == 'CREATE')}">