Skip to content

#6504 fix lock refresh #6508

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
scolapasta merged 2 commits into from
Jan 13, 2020
Merged

#6504 fix lock refresh #6508

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03b163
#6504 fix lock refresh
sekmiller Jan 13, 2020
7efea0e
#6504 add back CDATA tags
sekmiller Jan 13, 2020
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
86 changes: 45 additions & 41 deletions src/main/webapp/dataset.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,51 @@
<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>
//<![CDATA[
// 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">
Expand Down Expand Up @@ -1672,47 +1717,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>

Expand Down