From e44a99d95f75e718915d8bfa722fc00ae69e41e0 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 6 Mar 2020 17:48:52 +0100
Subject: [PATCH] FEAT #13470 TIME 1:10 Fix initiator when updating
---
apps/maarch_entreprise/xml/documentEditorsConfig.xml | 4 ++--
src/app/resource/controllers/StoreController.php | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/apps/maarch_entreprise/xml/documentEditorsConfig.xml b/apps/maarch_entreprise/xml/documentEditorsConfig.xml
index 3d625f1c741..3a7e2f433fc 100644
--- a/apps/maarch_entreprise/xml/documentEditorsConfig.xml
+++ b/apps/maarch_entreprise/xml/documentEditorsConfig.xml
@@ -5,8 +5,8 @@
</java>
<onlyoffice>
<enabled>true</enabled>
- <server_uri>onlyoffice.maarchcourrier.com</server_uri>
- <server_port>80</server_port>
+ <server_uri>192.168.1.14</server_uri>
+ <server_port>4243</server_port>
<server_ssl>false</server_ssl>
</onlyoffice>
</ROOT>
diff --git a/src/app/resource/controllers/StoreController.php b/src/app/resource/controllers/StoreController.php
index d49eae00ee7..25fe46acb98 100755
--- a/src/app/resource/controllers/StoreController.php
+++ b/src/app/resource/controllers/StoreController.php
@@ -238,7 +238,10 @@ class StoreController
$entity = EntityModel::getById(['id' => $args['initiator'], 'select' => ['entity_id']]);
$preparedData['initiator'] = $entity['entity_id'];
} else {
- $preparedData['initiator'] = null;
+ $definedVars = get_defined_vars();
+ if (array_key_exists('initiator', $definedVars['args'])) {
+ $preparedData['initiator'] = null;
+ }
}
if (isset($args['documentDate'])) {
--
GitLab