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

fix: [users:view] Correctly reload authkey child panel when performing operations

cli-modification-summary
Sami Mokaddem 2022-01-27 10:21:55 +01:00
parent 789bd9926f
commit dc8710d89e
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/AuthKeys/index.php
View File

@ -10,7 +10,8 @@ echo $this->element('genericElements/IndexTable/index_table', [
'data' => [ 'data' => [
'type' => 'simple', 'type' => 'simple',
'text' => __('Add authentication key'), 'text' => __('Add authentication key'),
'popover_url' => '/authKeys/add' 'popover_url' => '/authKeys/add',
'reload_url' => $this->request->getRequestTarget()
] ]
] ]
], ],
@ -65,7 +66,8 @@ echo $this->element('genericElements/IndexTable/index_table', [
[ [
'open_modal' => '/authKeys/delete/[onclick_params_data_path]', 'open_modal' => '/authKeys/delete/[onclick_params_data_path]',
'modal_params_data_path' => 'id', 'modal_params_data_path' => 'id',
'icon' => 'trash' 'icon' => 'trash',
'reload_url' => $this->request->getRequestTarget()
] ]
] ]
] ]

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

@ -1,8 +1,10 @@
<?php <?php
$seed = 'f_' . mt_rand();
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(this, \'%s\', \'%s\')"', 'onClick="openModalForButton%s(this, \'%s\', \'%s\')"',
$seed,
h($data['popover_url']), h($data['popover_url']),
h(!empty($data['reload_url']) ? $data['reload_url'] : '') h(!empty($data['reload_url']) ? $data['reload_url'] : '')
); );
@ -70,7 +72,7 @@
?> ?>
<script> <script>
function openModalForButton(clicked, url, reloadUrl='') { function openModalForButton<?= $seed ?>(clicked, url, reloadUrl='') {
const fallbackReloadUrl = '<?= $this->Url->build(['action' => 'index']); ?>' const fallbackReloadUrl = '<?= $this->Url->build(['action' => 'index']); ?>'
reloadUrl = reloadUrl != '' ? reloadUrl : fallbackReloadUrl reloadUrl = reloadUrl != '' ? reloadUrl : fallbackReloadUrl
UI.overlayUntilResolve(clicked, UI.submissionModalForIndex(url, reloadUrl, '<?= $tableRandomValue ?>')) UI.overlayUntilResolve(clicked, UI.submissionModalForIndex(url, reloadUrl, '<?= $tableRandomValue ?>'))