diff --git a/src/Controller/InboxController.php b/src/Controller/InboxController.php index 92f8dab..8179c64 100644 --- a/src/Controller/InboxController.php +++ b/src/Controller/InboxController.php @@ -59,6 +59,9 @@ class InboxController extends AppController public function delete($id) { + $this->set('deletionTitle', __('Discard request')); + $this->set('deletionText', __('Are you sure you want to discard request #{0}?', $id)); + $this->set('deletionConfirm', __('Discard')); $this->CRUD->delete($id); $responsePayload = $this->CRUD->getResponsePayload(); if (!empty($responsePayload)) { diff --git a/templates/Inbox/index.php b/templates/Inbox/index.php index e43d0e1..fd550a8 100644 --- a/templates/Inbox/index.php +++ b/templates/Inbox/index.php @@ -75,12 +75,17 @@ echo $this->element('genericElements/IndexTable/index_table', [ 'description' => __('A list of requests to be manually processed'), 'actions' => [ [ - 'open_modal' => '/inbox/process/[onclick_params_data_path]', - 'modal_params_data_path' => 'id', + 'url' => '/inbox/view', + 'url_params_data_paths' => ['id'], 'icon' => 'eye' ], [ - 'open_modal' => '/individuals/delete/[onclick_params_data_path]', + 'open_modal' => '/inbox/process/[onclick_params_data_path]', + 'modal_params_data_path' => 'id', + 'icon' => 'cogs' + ], + [ + 'open_modal' => '/inbox/delete/[onclick_params_data_path]', 'modal_params_data_path' => 'id', 'icon' => 'trash' ], diff --git a/templates/Inbox/view.php b/templates/Inbox/view.php index 89ccc8e..36e0dfc 100644 --- a/templates/Inbox/view.php +++ b/templates/Inbox/view.php @@ -43,6 +43,7 @@ echo $this->element( [ 'key' => 'data', 'path' => 'data', + 'type' => 'json' ], ], 'children' => [] diff --git a/templates/element/genericElements/SingleViews/Fields/jsonField.php b/templates/element/genericElements/SingleViews/Fields/jsonField.php new file mode 100644 index 0000000..9e6a687 --- /dev/null +++ b/templates/element/genericElements/SingleViews/Fields/jsonField.php @@ -0,0 +1,3 @@ +%s', h(json_encode($value, JSON_PRETTY_PRINT))); diff --git a/templates/genericTemplates/delete.php b/templates/genericTemplates/delete.php index 8e008bd..6b07d6a 100644 --- a/templates/genericTemplates/delete.php +++ b/templates/genericTemplates/delete.php @@ -1,7 +1,13 @@