diff --git a/templates/element/genericElements/ListTopBar/element_simple.php b/templates/element/genericElements/ListTopBar/element_simple.php index d0bd940..c0262b5 100644 --- a/templates/element/genericElements/ListTopBar/element_simple.php +++ b/templates/element/genericElements/ListTopBar/element_simple.php @@ -2,7 +2,7 @@ if (!isset($data['requirement']) || $data['requirement']) { if (!empty($data['popover_url'])) { $onClick = sprintf( - 'onClick="openModalForButton(%s)"', + 'onClick="openModalForButton(this, %s)"', sprintf("'%s'", h($data['popover_url'])) ); } @@ -69,7 +69,11 @@ ?> \ No newline at end of file diff --git a/webroot/js/bootstrap-helper.js b/webroot/js/bootstrap-helper.js index fc9c303..025b6ee 100644 --- a/webroot/js/bootstrap-helper.js +++ b/webroot/js/bootstrap-helper.js @@ -52,7 +52,7 @@ class UIFactory { * @return {Promise} Promise object resolving to the ModalFactory object */ 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 let $elligibleTable = $('table.table') let currentModel = location.pathname.split('/')[1]