diff --git a/core/src/cats/sql_list.cc b/core/src/cats/sql_list.cc index 0b7bc5f9ab6..99ed939b702 100644 --- a/core/src/cats/sql_list.cc +++ b/core/src/cats/sql_list.cc @@ -343,7 +343,7 @@ void BareosDb::ListVolumesOfJobid(JobControlRecord* jcr, edit_int64(JobId, ed1)); } else { Mmsg(cmd, - "SELECT Media.VolumeName " + "SELECT DISTINCT Media.VolumeName " "FROM JobMedia,Media WHERE Media.MediaId=JobMedia.MediaId " "AND JobMedia.JobId=%s", edit_int64(JobId, ed1)); diff --git a/webui/module/Job/src/Job/Model/JobModel.php b/webui/module/Job/src/Job/Model/JobModel.php index ad4f5eebbea..f1b3262ad31 100644 --- a/webui/module/Job/src/Job/Model/JobModel.php +++ b/webui/module/Job/src/Job/Model/JobModel.php @@ -5,7 +5,7 @@ * bareos-webui - Bareos Web-Frontend * * @link https://github.com/bareos/bareos for the canonical source repository - * @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/) + * @copyright Copyright (c) 2013-2019 Bareos GmbH & Co. KG (http://www.bareos.org/) * @license GNU Affero General Public License (http://www.gnu.org/licenses/) * * This program is free software: you can redistribute it and/or modify @@ -210,7 +210,7 @@ public function getJobLog(&$bsock=null, $id=null) */ public function getJobMedia(&$bsock=null, $jobid=null) { - $cmd = 'llist jobmedia jobid='.$jobid; + $cmd = 'list volumes jobid='.$jobid; $result = $bsock->send_command($cmd, 2); if(preg_match('/Failed to send result as json. Maybe result message to long?/', $result)) { //return false; @@ -219,7 +219,7 @@ public function getJobMedia(&$bsock=null, $jobid=null) } else { $jobmedia = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY); - return $jobmedia['result']['jobmedia']; + return $jobmedia['result']['volumes']; } } diff --git a/webui/module/Job/view/job/job/details.phtml b/webui/module/Job/view/job/job/details.phtml index 6a9e0ca07f8..938fc5574b4 100644 --- a/webui/module/Job/view/job/job/details.phtml +++ b/webui/module/Job/view/job/job/details.phtml @@ -5,7 +5,7 @@ * bareos-webui - Bareos Web-Frontend * * @link https://github.com/bareos/bareos for the canonical source repository - * @copyright Copyright (c) 2013-2017 Bareos GmbH & Co. KG (http://www.bareos.org/) + * @copyright Copyright (c) 2013-2019 Bareos GmbH & Co. KG (http://www.bareos.org/) * @license GNU Affero General Public License (http://www.gnu.org/licenses/) * * This program is free software: you can redistribute it and/or modify @@ -172,31 +172,6 @@ $this->headTitle($title); return html.join(''); } - function detailFormatterJobMedia(index, row) { - var html = []; - html.push('
'); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push(''); - html.push('
translate("First Index"); ?>' + row.firstindex + '
translate("Last Index"); ?>' + row.lastindex + '
translate("Start Block"); ?>' + row.startblock + '
translate("End Block"); ?>' + row.endblock + '
'); - html.push('
'); - return html.join(''); - } - function getJobDetails() { jobdetails = $('#jobdetails').bootstrapTable({ locale: '', @@ -345,8 +320,6 @@ $this->headTitle($title); search: true, sortName: 'volumename', sortOrder: 'asc', - detailView: true, - detailFormatter: 'detailFormatterJobMedia', columns: [ { field: 'volumename',