Merge pull request #1023 from bareos/dev/fbergkemper/master/fix-broke…

…n-clientname-link webui: client details now can be displayed for client names containing dots
bareos · Dec 16, 2021 · 248a2ea · 248a2ea
2 parents fca4a2d + 8341a1e
commit 248a2ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -68,6 +68,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https:
 - fix crash in "status scheduler" command when job->client is unset [PR #965]
 - [Issue #847]: fix for CVE-2017-14610 PID files that could be exploited on certain systems [PR #928]
 - webui: fix a layout corner case where top navbar is hiding navtabs [PR #1022]
+- webui: client details now can be displayed for client names containing dots [PR #1023]
 
 ### Added
 - systemtests: make database credentials configurable [PR #950]

diff --git a/webui/module/Client/src/Client/Controller/ClientController.php b/webui/module/Client/src/Client/Controller/ClientController.php
@@ -195,7 +195,7 @@ public function detailsAction()
 
     return new ViewModel(
       array(
-        'client' => $this->params()->fromRoute('id')
+        'client' => $this->params()->fromQuery('client')
       )
     );
   }

diff --git a/webui/public/js/bootstrap-table-formatter.js b/webui/public/js/bootstrap-table-formatter.js
@@ -34,7 +34,7 @@ function formatJobName(value, basePath, displayRange) {
 }
 
 function formatClientName(value, basePath) {
-   return '<a href="' + basePath + '/client/details/' + value + '">' + value + '</a>';
+   return '<a href="' + basePath + '/client/details?client=' + value + '">' + value + '</a>';
 }
 
 function formatJobType(data) {
@@ -435,10 +435,6 @@ function formatScheduleName(value, basePath) {
    return '<a href="' + basePath + '/schedule/details?schedule=' + value + '">' + value + '</a>';
 }
 
-function formatClientName(value, basePath) {
-   return '<a href="' + basePath + '/client/details/' + value + '">' + value + '</a>';
-}
-
 function formatFilesetName(value, row, index, basePath) {
    return '<a href="' + basePath + '/fileset/details/' + row.filesetid + '">' + row.fileset + '</a>';
 }