diff options
| author | Andreas Rogge <andreas.rogge@bareos.com> | 2022-11-08 16:36:28 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-08 16:36:28 +0300 |
| commit | ec48e4513add94397e9a9ee63c8aab4fd6211a14 (patch) | |
| tree | de1313fb8c5c7ac4c79d1eeae0bb9fdf289ba32e | |
| parent | 43dea814df71216651108f87f21f0116195a6b6c (diff) | |
| parent | 38c562651e44279e0a7ebea65fef66cdc1211e00 (diff) | |
Merge pull request #1302dev/bpoed/master/localization
webui: fix pool link in job details formatter
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | webui/module/Job/view/job/job/details.phtml | 2 | ||||
| -rw-r--r-- | webui/module/Job/view/job/job/index.phtml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 78f22bae1..ebd5c7356 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,7 @@ and since Bareos version 20 this project adheres to [Semantic Versioning](https: - winbareos.nsi: fix working directory in configure.sed [PR #1288] - core: BareosDb::FindLastJobStartTimeForJobAndClient: take into account Running job [PR #1265] [BUG #1466] - backup.cc: fail backup when `Write Bootstrap` to pipe fails [PR #1296] +- webui: fix pool link in job details formatter [PR 1306] [BUG #1489] ### Changed - contrib: rename Python modules to satisfy PEP8 [PR #768] diff --git a/webui/module/Job/view/job/job/details.phtml b/webui/module/Job/view/job/job/details.phtml index 760feab51..c7698c09c 100644 --- a/webui/module/Job/view/job/job/details.phtml +++ b/webui/module/Job/view/job/job/details.phtml @@ -155,7 +155,7 @@ $this->headTitle($title); html.push('</tr>'); html.push('<tr>'); html.push('<th><?php echo addslashes($this->translate("Pool")); ?></th>'); - html.push('<td><a href="<?php echo $this->basePath() . '/pool/details/'; ?>' + row.poolname + '">' + row.poolname + '</a></td>'); + html.push('<td><a href="<?php echo $this->basePath() . '/pool/details/?pool='; ?>' + row.poolname + '">' + row.poolname + '</a></td>'); html.push('</tr>'); html.push('<tr>'); html.push('<th><?php echo addslashes($this->translate("Scheduled")); ?></th>'); diff --git a/webui/module/Job/view/job/job/index.phtml b/webui/module/Job/view/job/job/index.phtml index 56a2e83e6..89b49f20c 100644 --- a/webui/module/Job/view/job/job/index.phtml +++ b/webui/module/Job/view/job/job/index.phtml @@ -310,7 +310,7 @@ $this->headTitle($title); html.push('</tr>'); html.push('<tr>'); html.push('<th><?php echo addslashes($this->translate("Pool")); ?></th>'); - html.push('<td><a href="<?php echo $this->basePath() . '/pool/details/'; ?>' + row.poolname + '">' + row.poolname + '</a></td>'); + html.push('<td><a href="<?php echo $this->basePath() . '/pool/details/?pool='; ?>' + row.poolname + '">' + row.poolname + '</a></td>'); html.push('</tr>'); html.push('<tr>'); html.push('<th><?php echo addslashes($this->translate("Scheduled")); ?></th>'); |