From: Marcin Haba Date: Mon, 12 Dec 2022 09:13:57 +0000 (+0100) Subject: Add afterjobid parameter to job list endpoint X-Git-Tag: Release-13.0.2~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e654a55037d3ab6afb87b729c4e2f02844b6d31c;p=thirdparty%2Fbacula.git Add afterjobid parameter to job list endpoint --- diff --git a/gui/baculum/protected/API/Pages/API/Jobs.php b/gui/baculum/protected/API/Pages/API/Jobs.php index 34161e647..7f6021e3c 100644 --- a/gui/baculum/protected/API/Pages/API/Jobs.php +++ b/gui/baculum/protected/API/Pages/API/Jobs.php @@ -36,6 +36,7 @@ class Jobs extends BaculumAPIServer { public function get() { $misc = $this->getModule('misc'); $jobids = $this->Request->contains('jobids') && $misc->isValidIdsList($this->Request['jobids']) ? $this->Request['jobids'] : ''; + $afterjobid = $this->Request->contains('afterjobid') && $misc->isValidInteger($this->Request['afterjobid']) ? $this->Request['afterjobid'] : 0; $limit = $this->Request->contains('limit') && $misc->isValidInteger($this->Request['limit']) ? (int)$this->Request['limit'] : 0; $offset = $this->Request->contains('offset') && $misc->isValidInteger($this->Request['offset']) ? (int)$this->Request['offset'] : 0; $jobstatus = $this->Request->contains('jobstatus') ? $this->Request['jobstatus'] : ''; @@ -109,6 +110,15 @@ class Jobs extends BaculumAPIServer { $params = []; + + if ($afterjobid > 0) { + $params['Job.JobId'] = []; + $params['Job.JobId'][] = [ + 'operator' => '>', + 'vals' => $afterjobid + ]; + } + $jobstatuses = array_keys($misc->getJobState()); $sts = str_split($jobstatus); $counter = 0; diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json index 74472c08f..3b8df22e7 100644 --- a/gui/baculum/protected/API/openapi_baculum.json +++ b/gui/baculum/protected/API/openapi_baculum.json @@ -863,6 +863,15 @@ "type": "string" } }, + { + "name": "afterjobid", + "in": "query", + "required": false, + "description": "Displays jobs after given job identifier with excluding the given jobid.", + "schema": { + "type": "integer" + } + }, { "name": "jobstatus", "in": "query",