Merge branch 'bareos-17.2'

bareos · Sep 21, 2017 · 89bbfb7 · 89bbfb7
2 parents 0fb8ce5 + c25e550
commit 89bbfb7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,10 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+### Changed
+
+### Removed
+
+## [17.2.4-rc1]
+
 ### Added
 - Job Totals Dashboard Widget
-- Running Jobs Dashboard Widget (requires core commit eae7ad953ed5c92cee562c2246719e073220603c for proper functionality)
+- Running Jobs Dashboard Widget
 - Bootstrap Table Extension
+- Job submodule run customized jobs
+- Job Module: Used Volumes Widget
 - New configuration.ini variable (autorefresh_interval) introduced
   to define the dashboard refresh interval (default: 60sec.)
 - Slovak localization

diff --git a/README.md b/README.md
@@ -22,5 +22,5 @@ The Bareos project offers two mailing lists: bareos-users and bareos-devel.
 
 [CHANGELOG]: ./CHANGELOG.md
 [LICENSE]: ./LICENSE
-[version-badge]: https://img.shields.io/badge/version-master-blue.svg
+[version-badge]: https://img.shields.io/badge/version-17.2.4-blue.svg
 [license-badge]: https://img.shields.io/badge/license-AGPL--3.0-blue.svg
diff --git a/module/Job/src/Job/Model/JobModel.php b/module/Job/src/Job/Model/JobModel.php
@@ -62,7 +62,7 @@ public function getJobs(&$bsock=null, $jobname=null, $days=null)
                return $error['result']['error'];
             } else {
                $jobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-               if ( empty($jobs['result']['jobs']) || is_null($jobs['result']['jobs']) ) {
+               if ( empty($jobs['result']['jobs']) && $jobs['result']['meta']['range']['filtered'] === 0 ) {
                   return $retval;
                } else {
                   $retval = array_merge($retval, $jobs['result']['jobs']);
@@ -117,7 +117,7 @@ public function getJobsByStatus(&$bsock=null, $jobname=null, $status=null, $days
                return $error['result']['error'];
             } else {
                $jobs = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-               if ( empty($jobs['result']['jobs']) || is_null($jobs['result']['jobs']) ) {
+               if ( empty($jobs['result']['jobs']) && $jobs['result']['meta']['range']['filtered'] === 0 ) {
                   return array_reverse($retval);
                } else {
                   $retval = array_merge($retval, $jobs['result']['jobs']);
@@ -174,7 +174,7 @@ public function getJobLog(&$bsock=null, $id=null)
             }
             else {
                $log = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-               if ( empty($log['result']['joblog']) || is_null($log['result']['joblog']) ) {
+               if ( empty($log['result']['joblog']) && $log['result']['meta']['range']['filtered'] === 0 ) {
                   return $retval;
                } else {
                   $retval = array_merge($retval, $log['result']['joblog']);

diff --git a/module/Media/src/Media/Model/MediaModel.php b/module/Media/src/Media/Model/MediaModel.php
@@ -49,7 +49,7 @@ public function getVolumes(&$bsock=null)
                return $error['result']['error'];
             } else {
                $volumes = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-               if ( empty($volumes['result']['volumes']) || is_null($volumes['result']['volumes']) ) {
+               if ( empty($volumes['result']['volumes']) && $volumes['result']['meta']['range']['filtered'] === 0 ) {
                   return $retval;
                } else {
                   $retval = array_merge($retval, $volumes['result']['volumes']);

diff --git a/module/Pool/src/Pool/Model/PoolModel.php b/module/Pool/src/Pool/Model/PoolModel.php
@@ -117,7 +117,7 @@ public function getPoolMedia(&$bsock=null, $pool=null)
                return $error['result']['error'];
             } else {
                $media = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
-               if ( empty($media['result']['volumes']) || is_null($media['result']['volumes']) ) {
+               if ( empty($media['result']['volumes']) && $media['result']['meta']['range']['filtered'] === 0 ) {
                   return $retval;
                } else {
                   $retval = array_merge($retval, $media['result']['volumes']);