From f1a90be86d1782145e9cb4d2c8de706cf4fb41e0 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 4 Jul 2021 18:27:20 +0200 Subject: [PATCH] formatting fixes, bug fixes and support impl. --- .directory | 0 Admin/Install/Navigation.install.json | 0 Admin/Install/Navigation.php | 0 Admin/Install/db.json | 0 Admin/Installer.php | 0 Admin/Routes/Web/Backend.php | 0 Admin/Status.php | 0 Admin/Uninstaller.php | 0 Admin/Updater.php | 0 Controller/ApiController.php | 2 +- Controller/BackendController.php | 0 Controller/Controller.php | 2 +- Models/Contract.php | 0 Models/ContractMapper.php | 0 Models/ContractType.php | 2 +- Models/ContractTypeL11n.php | 0 Models/ContractTypeL11nMapper.php | 0 Models/ContractTypeMapper.php | 0 Models/NullContract.php | 0 Models/NullContractType.php | 0 Models/NullContractTypeL11n.php | 0 Models/PermissionState.php | 0 README.md | 0 Theme/Backend/Lang/Navigation.en.lang.php | 0 Theme/Backend/Lang/en.lang.php | 0 Theme/Backend/contract-list.tpl.php | 6 ++++-- Theme/Backend/contract-single.tpl.php | 0 info.json | 0 28 files changed, 7 insertions(+), 5 deletions(-) mode change 100644 => 100755 .directory mode change 100644 => 100755 Admin/Install/Navigation.install.json mode change 100644 => 100755 Admin/Install/Navigation.php mode change 100644 => 100755 Admin/Install/db.json mode change 100644 => 100755 Admin/Installer.php mode change 100644 => 100755 Admin/Routes/Web/Backend.php mode change 100644 => 100755 Admin/Status.php mode change 100644 => 100755 Admin/Uninstaller.php mode change 100644 => 100755 Admin/Updater.php mode change 100644 => 100755 Controller/ApiController.php mode change 100644 => 100755 Controller/BackendController.php mode change 100644 => 100755 Controller/Controller.php mode change 100644 => 100755 Models/Contract.php mode change 100644 => 100755 Models/ContractMapper.php mode change 100644 => 100755 Models/ContractType.php mode change 100644 => 100755 Models/ContractTypeL11n.php mode change 100644 => 100755 Models/ContractTypeL11nMapper.php mode change 100644 => 100755 Models/ContractTypeMapper.php mode change 100644 => 100755 Models/NullContract.php mode change 100644 => 100755 Models/NullContractType.php mode change 100644 => 100755 Models/NullContractTypeL11n.php mode change 100644 => 100755 Models/PermissionState.php mode change 100644 => 100755 README.md mode change 100644 => 100755 Theme/Backend/Lang/Navigation.en.lang.php mode change 100644 => 100755 Theme/Backend/Lang/en.lang.php mode change 100644 => 100755 Theme/Backend/contract-list.tpl.php mode change 100644 => 100755 Theme/Backend/contract-single.tpl.php mode change 100644 => 100755 info.json diff --git a/.directory b/.directory old mode 100644 new mode 100755 diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json old mode 100644 new mode 100755 diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php old mode 100644 new mode 100755 diff --git a/Admin/Install/db.json b/Admin/Install/db.json old mode 100644 new mode 100755 diff --git a/Admin/Installer.php b/Admin/Installer.php old mode 100644 new mode 100755 diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php old mode 100644 new mode 100755 diff --git a/Admin/Status.php b/Admin/Status.php old mode 100644 new mode 100755 diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php old mode 100644 new mode 100755 diff --git a/Admin/Updater.php b/Admin/Updater.php old mode 100644 new mode 100755 diff --git a/Controller/ApiController.php b/Controller/ApiController.php old mode 100644 new mode 100755 index 622014a..5d1434a --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -141,7 +141,7 @@ final class ApiController extends Controller } $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( - $request->getData('name') ?? '', + [$request->getData('name') ?? ''], $uploadedFiles, $request->header->account, __DIR__ . '/../../../Modules/Media/Files/Modules/ContractManagement/Contracts/' . ($request->getData('contract_title') ?? '0'), diff --git a/Controller/BackendController.php b/Controller/BackendController.php old mode 100644 new mode 100755 diff --git a/Controller/Controller.php b/Controller/Controller.php old mode 100644 new mode 100755 index d80d32d..fc8fecd --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -17,7 +17,7 @@ namespace Modules\ContractManagement\Controller; use phpOMS\Module\ModuleAbstract; /** - * Task class. + * Contract controller class. * * @package Modules\ContractManagement * @license OMS License 1.0 diff --git a/Models/Contract.php b/Models/Contract.php old mode 100644 new mode 100755 diff --git a/Models/ContractMapper.php b/Models/ContractMapper.php old mode 100644 new mode 100755 diff --git a/Models/ContractType.php b/Models/ContractType.php old mode 100644 new mode 100755 index 1b54edd..d4b292b --- a/Models/ContractType.php +++ b/Models/ContractType.php @@ -90,7 +90,7 @@ class ContractType implements \JsonSerializable, ArrayableInterface { if ($l11n instanceof ContractTypeL11n) { $this->l11n = $l11n; - } elseif ($this->l11n instanceof ContractTypeL11n) { + } elseif (isset($this->l11n) && $this->l11n instanceof ContractTypeL11n) { $this->l11n->title = $l11n; } else { $this->l11n = new ContractTypeL11n(); diff --git a/Models/ContractTypeL11n.php b/Models/ContractTypeL11n.php old mode 100644 new mode 100755 diff --git a/Models/ContractTypeL11nMapper.php b/Models/ContractTypeL11nMapper.php old mode 100644 new mode 100755 diff --git a/Models/ContractTypeMapper.php b/Models/ContractTypeMapper.php old mode 100644 new mode 100755 diff --git a/Models/NullContract.php b/Models/NullContract.php old mode 100644 new mode 100755 diff --git a/Models/NullContractType.php b/Models/NullContractType.php old mode 100644 new mode 100755 diff --git a/Models/NullContractTypeL11n.php b/Models/NullContractTypeL11n.php old mode 100644 new mode 100755 diff --git a/Models/PermissionState.php b/Models/PermissionState.php old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/contract-list.tpl.php b/Theme/Backend/contract-list.tpl.php old mode 100644 new mode 100755 index 0da1544..3d80889 --- a/Theme/Backend/contract-list.tpl.php +++ b/Theme/Backend/contract-list.tpl.php @@ -76,11 +76,13 @@ echo $this->getData('nav')->render(); ?> $url = UriFactory::build('{/prefix}contract/single?{?}&id=' . $value->getId()); $type = 'ok'; - if ($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 129600 > $now->getTimestamp()) { + if (($value->end->getTimestamp() < $now->getTimestamp() && $value->end->getTimestamp() + 7776000 > $now->getTimestamp()) + || ($value->end->getTimestamp() > $now->getTimestamp() && $value->end->getTimestamp() - 7776000 < $now->getTimestamp()) + ) { $type = 'error'; } elseif ($value->end->getTimestamp() < $now->getTimestamp()) { $type = 'info'; - } elseif ($value->end->getTimestamp() + 129600 < $now->getTimestamp()) { + } elseif ($value->end->getTimestamp() + 7776000 < $now->getTimestamp()) { $type = 'warning'; } ?> diff --git a/Theme/Backend/contract-single.tpl.php b/Theme/Backend/contract-single.tpl.php old mode 100644 new mode 100755 diff --git a/info.json b/info.json old mode 100644 new mode 100755