From 0ed56ca067219c684aceb3561c4d4c1a3b6cc32d Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 22 May 2026 14:04:32 +0200 Subject: [PATCH] add config for userAutomatedTags --- application/config/stv.php | 2 ++ application/controllers/jobs/TagJob.php | 7 ------- application/libraries/TagLib.php | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/application/config/stv.php b/application/config/stv.php index 3090e3f2e..bcaf0cfde 100644 --- a/application/config/stv.php +++ b/application/config/stv.php @@ -151,3 +151,5 @@ $config['stv_prestudent_tags'] = [ 'stbtr_erh_auto' => ['readonly' => true], 'jgv_auto' => ['readonly' => true], ]; + +$config['userAutomatedTags'] = 'sftest'; diff --git a/application/controllers/jobs/TagJob.php b/application/controllers/jobs/TagJob.php index d12231b06..ae21883e9 100644 --- a/application/controllers/jobs/TagJob.php +++ b/application/controllers/jobs/TagJob.php @@ -6,9 +6,6 @@ use \DateTime as DateTime; class TagJob extends JOB_Controller { - - const BATCHUSER = 'sftest'; - /** * API constructor */ @@ -34,8 +31,6 @@ class TagJob extends JOB_Controller public function rebuildAutomatedTags() { - - $automatedTagsRes = $this->NotiztypModel->loadWhere(array('automatisiert' => true, 'taglib IS NOT NULL' => null)); $automatedTags = hasData($automatedTagsRes) ? getData($automatedTagsRes) : []; @@ -109,9 +104,7 @@ class TagJob extends JOB_Controller $this->logInfo("Tag " . $result->retval['input']['tag'] . "Deleted tags(s: " . implode(', ', $result->retval['results']['deletedTagsIds'])); if ($result->retval['results']['retaggedIds']) $this->logInfo("Tag " . $result->retval['input']['tag'] . "Recycled tag(s): " . implode(', ', $result->retval['results']['retaggedIds'])); - } $this->logInfo( "End Job rebuild Automated Tags"); - } } diff --git a/application/libraries/TagLib.php b/application/libraries/TagLib.php index a9322cd12..c4107f416 100644 --- a/application/libraries/TagLib.php +++ b/application/libraries/TagLib.php @@ -16,8 +16,6 @@ use \stdClass as stdClass; class TagLib { - const BATCHUSER = 'sftest'; - /** * Object initialization */ @@ -38,6 +36,8 @@ class TagLib // Libraries $this->_ci->load->library('PermissionLib'); $this->_ci->load->library('PrestudentLib'); + + $batchUser = $this->_ci->config->item('userAutomatedTags'); } public function updateAutomatedTags($paramsTag) @@ -321,7 +321,7 @@ class TagLib $resultInsert = $this->_ci->NotizModel->insert([ 'titel' => 'TAG', 'text' => 'AUTOMATED TAG', - 'verfasser_uid' => self::BATCHUSER, + 'verfasser_uid' => $this->batchUser, 'erledigt' => false, 'insertamum' => date('Y-m-d H:i:s'), 'insertvon' => 'BatchJobTagAdd',