Jingga/oms-ContractManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ContractManagement.git synced 2026-02-18 11:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug and media fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-10-29 14:49:55 +02:00
parent 9cf2887c3b
commit a710da7d2a
15 changed files with 64 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Controller/ApiController.php
View File

@ -15,23 +15,20 @@ declare(strict_types=1);
namespace Modules\ContractManagement\Controller;
use Modules\Admin\Models\NullAccount;
use Modules\ContractManagement\Models\Contract;
use Modules\ContractManagement\Models\ContractMapper;
use Modules\ContractManagement\Models\ContractType;
use Modules\ContractManagement\Models\ContractTypeMapper;
use Modules\ContractManagement\Models\ContractTypeL11n;
use Modules\ContractManagement\Models\ContractTypeL11nMapper;
use phpOMS\Message\Http\HttpResponse;
use Modules\ContractManagement\Models\ContractTypeMapper;
use Modules\ContractManagement\Models\NullContractType;
use Modules\Media\Models\PathSettings;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation;
use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Message\Http\HttpRequest;
use Modules\Media\Models\PathSettings;
use Modules\ContractManagement\Models\Contract;
use Modules\ContractManagement\Models\NullContractType;
use Modules\ContractManagement\Models\ContractMapper;
use phpOMS\Localization\ISO639x1Enum;
/**
* Api controller for the contracts module.
@ -143,7 +140,8 @@ final class ApiController extends Controller
}
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[$request->getData('name') ?? ''],
$request->getDataList('names') ?? [],
$request->getDataList('filenames') ?? [],
$uploadedFiles,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Modules/ContractManagement/Contracts/' . ($request->getData('contract_title') ?? '0'),

9
Controller/BackendController.php
View File

@ -14,17 +14,12 @@ declare(strict_types=1);
namespace Modules\ContractManagement\Controller;
use Modules\ContractManagement\Models\PermissionState;
use phpOMS\Account\PermissionType;
use phpOMS\Asset\AssetType;
use Modules\ContractManagement\Models\ContractMapper;
use Modules\ContractManagement\Models\ContractTypeL11n;
use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View;
use Modules\ContractManagement\Models\ContractMapper;
use Modules\ContractManagement\Models\ContractType;
use Modules\ContractManagement\Models\ContractTypeL11n;
/**
* Backend controller for the contracts module.

2
Models/Contract.php
View File

@ -14,9 +14,9 @@ declare(strict_types=1);
namespace Modules\ContractManagement\Models;
use Modules\Media\Models\Media;
use Modules\Admin\Models\Account;
use Modules\Admin\Models\NullAccount;
use Modules\Media\Models\Media;
use phpOMS\Localization\Money;
/**

2
Models/ContractMapper.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\ContractManagement\Models;
use Modules\Media\Models\MediaMapper;
use Modules\Admin\Models\AccountMapper;
use Modules\Media\Models\MediaMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract;
/**

2
Models/ContractTypeMapper.php
View File

@ -50,7 +50,7 @@ final class ContractTypeMapper extends DataMapperAbstract
'column' => 'title',
'conditional' => true,
'external' => null,
]
],
];
/**

1
Theme/Backend/contract-list.tpl.php
View File

@ -12,7 +12,6 @@
*/
declare(strict_types=1);
use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory;
/**

3
Theme/Backend/contract-single.tpl.php
View File

@ -12,9 +12,6 @@
*/
declare(strict_types=1);
use Modules\Media\Models\NullMedia;
use phpOMS\Uri\UriFactory;
/**
* @var \phpOMS\Views\View $this
* @var \Modules\ContractManagement\Models\Contract $contract

14
tests/Controller/ApiControllerTest.php
View File

@ -16,26 +16,22 @@ namespace Modules\ContractManagement\tests\Controller;
use Model\CoreSettings;
use Modules\Admin\Models\AccountPermission;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Account\Account;
use phpOMS\Account\AccountManager;
use phpOMS\Account\PermissionType;
use phpOMS\Application\ApplicationAbstract;
use phpOMS\DataStorage\Session\HttpSession;
use phpOMS\Dispatcher\Dispatcher;
use phpOMS\Event\EventManager;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Utils\TestUtils;
use phpOMS\Localization\ISO639x1Enum;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\PathSettings;
use Modules\Media\Models\UploadStatus;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\System\File\Local\Directory;
use phpOMS\Module\ModuleAbstract;
use phpOMS\Module\ModuleManager;
use phpOMS\Router\WebRouter;
use phpOMS\Uri\HttpUri;
use phpOMS\Utils\TestUtils;
/**
* @testdox Modules\ContractManagement\tests\Controller\ApiControllerTest: ContractManagement api controller

1
tests/Models/ContractTypeTest.php
View File

@ -16,7 +16,6 @@ namespace Modules\ContractManagement\tests\Models;
use Modules\ContractManagement\Models\ContractType;
use Modules\ContractManagement\Models\ContractTypeL11n;
use phpOMS\Localization\ISO639x1Enum;
/**
* @internal