cerebrate-project
/
cerebrate
mirror of https://github.com/cerebrate-project/cerebrate
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: [js:bootstrap-helper] Correctly returns promise

pull/37/head
mokaddem 2021-01-12 11:36:33 +01:00
parent cd8d537273
commit 41f96dedcb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/element/genericElements/ListTopBar/element_simple.php
View File

@ -2,7 +2,7 @@
if (!isset($data['requirement']) || $data['requirement']) { if (!isset($data['requirement']) || $data['requirement']) {
if (!empty($data['popover_url'])) { if (!empty($data['popover_url'])) {
$onClick = sprintf( $onClick = sprintf(
'onClick="openModalForButton(%s)"', 'onClick="openModalForButton(this, %s)"',
sprintf("'%s'", h($data['popover_url'])) sprintf("'%s'", h($data['popover_url']))
); );
} }
@ -69,7 +69,11 @@
?> ?>
<script> <script>
function openModalForButton(url) { function openModalForButton(clicked, url) {
UI.openModalFromURL(url, '<?= $this->Url->build(['action' => 'index']); ?>', '<?= $tableRandomValue ?>') const loadingOverlay = new OverlayFactory(clicked);
loadingOverlay.show()
UI.openModalFromURL(url, '<?= $this->Url->build(['action' => 'index']); ?>', '<?= $tableRandomValue ?>').finally(() => {
loadingOverlay.hide()
})
} }
</script> </script>

2
webroot/js/bootstrap-helper.js
View File

@ -52,7 +52,7 @@ class UIFactory {
* @return {Promise<Object>} Promise object resolving to the ModalFactory object * @return {Promise<Object>} Promise object resolving to the ModalFactory object
*/ */
openModalFromURL(url, reloadUrl=false, tableId=false) { openModalFromURL(url, reloadUrl=false, tableId=false) {
UI.modalFromURL(url, () => { return UI.modalFromURL(url, () => {
if (reloadUrl === false || tableId === false) { // Try to get information from the DOM if (reloadUrl === false || tableId === false) { // Try to get information from the DOM
let $elligibleTable = $('table.table') let $elligibleTable = $('table.table')
let currentModel = location.pathname.split('/')[1] let currentModel = location.pathname.split('/')[1]