Merge branch 'samverstraete-patch-1'

bareos · Jan 23, 2017 · d3c5714 · d3c5714
2 parents 9c2f7bf + f9ec4e3
commit d3c5714
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/module/Restore/src/Restore/Model/RestoreModel.php b/module/Restore/src/Restore/Model/RestoreModel.php
@@ -91,15 +91,15 @@ public function getFiles(&$bsock=null, $jobid=null, $pathid=null) {
    public function getJobIds(&$bsock=null, $jobid=null, $mergefilesets=0, $mergejobs=0)
    {
       if(isset($bsock)) {
-         if($mergefilesets == 0 && $mergejobs == 0) {
+         if($mergefilesets == 1 && $mergejobs == 1) {
+            return $jobid;
+         }
+         if($mergefilesets == 0) {
             $cmd = '.bvfs_get_jobids jobid='.$jobid.' all';
          }
-         elseif($mergefilesets == 1 && $mergejobs == 0) {
+         else {
             $cmd = '.bvfs_get_jobids jobid='.$jobid.'';
          }
-         elseif($mergefilesets == 1 && $mergejobs == 1) {
-            return $jobid;
-         }
          $result = $bsock->send_command($cmd, 2, null);
          $jobids = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
          if(!empty($jobids['result'])) {