Skip to content
Snippets Groups Projects
Commit d03eea08 authored by VESSILLER's avatar VESSILLER
Browse files

FIX Pastell config flow is NULL

parent 7f3cb224
Branches master preprod
Tags v2.0.1
No related merge requests found
...@@ -1001,6 +1001,16 @@ class PageController extends Controller { ...@@ -1001,6 +1001,16 @@ class PageController extends Controller {
if (empty($this->_dematpayslipConfigList['payslip_dir']) || empty($this->_dematpayslipConfigList['user_id'])) { if (empty($this->_dematpayslipConfigList['payslip_dir']) || empty($this->_dematpayslipConfigList['user_id'])) {
$this->_msgList['error'][] = $this->l->t('Veuillez vérifier la configuration de cette application.'); $this->_msgList['error'][] = $this->l->t('Veuillez vérifier la configuration de cette application.');
} }
$pastellUse = OC::$server->getConfig()->getAppValue($this->appName, 'pastell_use', '');
if (!empty($pastellUse)) {
// check Pastell API config
$pastellConfigFlow1Id = OC::$server->getConfig()->getAppValue($this->appName, 'pastell_config_f1_id', '');
$pastellConfigFlow2Id = OC::$server->getConfig()->getAppValue($this->appName, 'pastell_config_f2_id', '');
if (!($pastellConfigFlow1Id > 0) || !($pastellConfigFlow2Id > 0)) {
$this->_msgList['error'][] = $this->l->t('Veuillez vérifier la configuration de cette application.');
}
}
} }
/** /**
......
...@@ -276,6 +276,16 @@ class AdminSettings implements ISettings { ...@@ -276,6 +276,16 @@ class AdminSettings implements ISettings {
} }
if (count($this->_msgList['error']) <= 0) { if (count($this->_msgList['error']) <= 0) {
$pastellConfigF1Id = $this->config->getAppValue($this->appName, 'pastell_config_f1_id');
// FIX -- Pastell config flow is NULL
if (empty($pastellConfigF1Id)) {
$this->config->deleteAppValue($this->appName,'pastell_config_f1_id');
}
$pastellConfigF2Id = $this->config->getAppValue($this->appName, 'pastell_config_f2_id');
// FIX -- Pastell config flow is NULL
if (empty($pastellConfigF2Id)) {
$this->config->deleteAppValue($this->appName,'pastell_config_f2_id');
}
$this->config->setAppValue($this->appName, 'pastell_config_f1_id', $pastellConfigFlow1Id); $this->config->setAppValue($this->appName, 'pastell_config_f1_id', $pastellConfigFlow1Id);
$this->config->setAppValue($this->appName, 'pastell_config_f2_id', $pastellConfigFlow2Id); $this->config->setAppValue($this->appName, 'pastell_config_f2_id', $pastellConfigFlow2Id);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment