bug and media fixes

This commit is contained in:
Dennis Eichhorn 2021-10-29 14:49:55 +02:00
parent c70332d69a
commit 5f1439ccad
12 changed files with 68 additions and 73 deletions

View File

@ -15,17 +15,19 @@ declare(strict_types=1);
namespace Modules\Surveys\Controller; namespace Modules\Surveys\Controller;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Tag\Models\NullTag; use Modules\Media\Models\NullMedia;
use Modules\Surveys\Models\SurveyAnswer;
use Modules\Surveys\Models\SurveyElementType;
use Modules\Surveys\Models\SurveyStatus;
use Modules\Surveys\Models\SurveyTemplate; use Modules\Surveys\Models\SurveyTemplate;
use Modules\Surveys\Models\SurveyTemplateL11n;
use Modules\Surveys\Models\SurveyTemplateLabelL11n;
use Modules\Surveys\Models\SurveyTemplateElement; use Modules\Surveys\Models\SurveyTemplateElement;
use Modules\Surveys\Models\SurveyTemplateElementL11n; use Modules\Surveys\Models\SurveyTemplateElementL11n;
use Modules\Surveys\Models\SurveyTemplateElementMapper; use Modules\Surveys\Models\SurveyTemplateElementMapper;
use Modules\Surveys\Models\SurveyTemplateL11n;
use Modules\Surveys\Models\SurveyTemplateLabelL11n;
use Modules\Surveys\Models\SurveyTemplateMapper; use Modules\Surveys\Models\SurveyTemplateMapper;
use Modules\Surveys\Models\SurveyStatus; use Modules\Tag\Models\NullTag;
use Modules\Surveys\Models\SurveyElementType; use phpOMS\Localization\ISO639x1Enum;
use Modules\Media\Models\NullMedia;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel; use phpOMS\Message\NotificationLevel;
@ -33,8 +35,6 @@ use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\Utils\Parser\Markdown\Markdown; use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Localization\ISO639x1Enum;
use Modules\Surveys\Models\SurveyAnswer;
/** /**
* Api controller for the survey module. * Api controller for the survey module.
@ -138,7 +138,8 @@ final class ApiController extends Controller
if (!empty($uploadedFiles = $request->getFiles() ?? [])) { if (!empty($uploadedFiles = $request->getFiles() ?? [])) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[''], [],
[],
$uploadedFiles, $uploadedFiles,
$request->header->account, $request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Modules/Surveys', __DIR__ . '/../../../Modules/Media/Files/Modules/Surveys',

View File

@ -14,13 +14,13 @@ declare(strict_types=1);
namespace Modules\Surveys\Controller; namespace Modules\Surveys\Controller;
use Modules\Media\Models\CollectionMapper;
use Modules\Surveys\Models\SurveyTemplateMapper;
use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
use phpOMS\Message\RequestAbstract; use phpOMS\Message\RequestAbstract;
use phpOMS\Message\ResponseAbstract; use phpOMS\Message\ResponseAbstract;
use phpOMS\Views\View; use phpOMS\Views\View;
use Modules\Surveys\Models\SurveyTemplateMapper;
use Modules\Media\Models\CollectionMapper;
use phpOMS\Asset\AssetType;
/** /**
* Surveys controller class. * Surveys controller class.

View File

@ -14,10 +14,10 @@ declare(strict_types=1);
namespace Modules\Surveys\Models; namespace Modules\Surveys\Models;
use phpOMS\Localization\ISO639x1Enum;
use Modules\Admin\Models\Account; use Modules\Admin\Models\Account;
use Modules\Tag\Models\Tag;
use Modules\Media\Models\Media; use Modules\Media\Models\Media;
use Modules\Tag\Models\Tag;
use phpOMS\Localization\ISO639x1Enum;
/** /**
* Survey class. * Survey class.

View File

@ -14,12 +14,7 @@ declare(strict_types=1);
namespace Modules\Surveys\Models; namespace Modules\Surveys\Models;
use Modules\Admin\Models\AccountMapper;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper;
use Modules\Tag\Models\TagMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;
use phpOMS\DataStorage\Database\RelationType;
/** /**
* Mapper class. * Mapper class.

View File

@ -15,7 +15,6 @@ declare(strict_types=1);
namespace Modules\Surveys\Models; namespace Modules\Surveys\Models;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Tag\Models\TagMapper; use Modules\Tag\Models\TagMapper;
use phpOMS\DataStorage\Database\DataMapperAbstract; use phpOMS\DataStorage\Database\DataMapperAbstract;