Skip to content

Commit

Permalink
Merge pull request #5113 from 3liz/backport-5105-to-release_3_9
Browse files Browse the repository at this point in the history
[Backport release_3_9] Display a generic error in case of action failure to the end-user
  • Loading branch information
Gustry authored Dec 11, 2024
2 parents b9780e1 + 7b103be commit f05d4e4
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions lizmap/modules/action/controllers/service.classic.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function index()
// Redirect if the user has no right to access this repository
if (!$lizmapProject->checkAcl()) {
$errors = array(
'title' => 'Access forbiden',
'title' => 'Access forbidden',
'detail' => jLocale::get('view~default.repository.access.denied'),
);

Expand Down Expand Up @@ -201,10 +201,14 @@ public function index()
$data = json_decode($r->data);
}
} catch (Exception $e) {
jLog::log('Error in project '.$repository.'/'.$project.', layer '.$layerId.', while running the query : '.$sql, 'lizmapadmin');
jLog::log(
'Error in project '.$repository.'/'.$project.', layer '.$layerId.', '.
'while running the action with the PostgreSQL query : '.$sql.''.$e->getMessage(),
'lizmapadmin'
);
$errors = array(
'title' => 'An error occurred while running the PostgreSQL query !',
'detail' => $e->getMessage(),
'title' => 'An error occurred while processing the request',
'detail' => 'Please contact the GIS administrator to look to the administrator logs.',
);

return $this->error($errors);
Expand Down

0 comments on commit f05d4e4

Please sign in to comment.