From 9bb4e2507a2056fdede0f4c7ac39f7fd56fccdd9 Mon Sep 17 00:00:00 2001 From: Paolo Date: Mon, 9 Mar 2020 13:41:17 +0100 Subject: [PATCH] - Added two new functions to config entry ou_function_whitelist - Fixed Vorlage_widget to retrieve univocally templates --- application/config/message.php | 2 +- application/widgets/Vorlage_widget.php | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/application/config/message.php b/application/config/message.php index 3a9629279..8232cdfb7 100644 --- a/application/config/message.php +++ b/application/config/message.php @@ -19,7 +19,7 @@ $config['ou_receivers_no_notice'] = array('infocenter'); // Organization units that will not send the notice email to the internal account, but to the private one $config['ou_receivers_private'] = array('eac', 'ewu', 'scs'); // -$config['ou_function_whitelist'] = array('ass', 'Leitung'); +$config['ou_function_whitelist'] = array('ass', 'Leitung', 'fachzuordnung', 'oezuordnung'); $config['message_redirect_url'] = array(); $config['message_redirect_url']['fallback'] = site_url('system/messages/ViewMessage/writeReply'); diff --git a/application/widgets/Vorlage_widget.php b/application/widgets/Vorlage_widget.php index 2ba685edc..f1898eb09 100644 --- a/application/widgets/Vorlage_widget.php +++ b/application/widgets/Vorlage_widget.php @@ -136,7 +136,8 @@ class Vorlage_widget extends DropdownWidget { $currentTmpVorlageData = getData($tmpVorlage)[$j]; - if (getData($vorlage)[$i]->_pk == getData($tmpVorlage)[$j]->_pk + if (getData($vorlage)[$i]->id == getData($tmpVorlage)[$j]->id + && getData($vorlage)[$i]->_pk == getData($tmpVorlage)[$j]->_pk && getData($vorlage)[$i]->_ppk == getData($tmpVorlage)[$j]->_ppk && getData($vorlage)[$i]->_jtpk == getData($tmpVorlage)[$j]->_jtpk) { @@ -145,7 +146,10 @@ class Vorlage_widget extends DropdownWidget } } - if (!$found && $currentTmpVorlageData->id != '') array_push($vorlage->retval, $currentTmpVorlageData); + if (!$found && $currentTmpVorlageData->id != '') + { + array_push($vorlage->retval, $currentTmpVorlageData); + } } } }