Jingga/oms-AssetManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-AssetManagement.git synced 2026-02-17 13:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-02-04 20:34:11 +00:00
parent fdaa7fd557
commit 659f897d53
2 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Controller/ApiAssetController.php
View File

@ -112,8 +112,10 @@ final class ApiAssetController extends Controller
{ {
$path = $this->createAssetDir($asset); $path = $this->createAssetDir($asset);
$collection = null;
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -123,7 +125,6 @@ final class ApiAssetController extends Controller
pathSettings: PathSettings::FILE_PATH pathSettings: PathSettings::FILE_PATH
); );
$collection = null;
foreach ($uploaded as $media) { foreach ($uploaded as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
@ -160,9 +161,7 @@ final class ApiAssetController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
$collection = null;
foreach ($mediaFiles as $file) { foreach ($mediaFiles as $file) {
/** @var \Modules\Media\Models\Media $media */ /** @var \Modules\Media\Models\Media $media */
$media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute(); $media = MediaMapper::get()->where('id', (int) $file)->limit(1)->execute();
@ -209,7 +208,6 @@ final class ApiAssetController extends Controller
); );
} }
} }
}
/** /**
* Validate asset create request * Validate asset create request
@ -260,7 +258,7 @@ final class ApiAssetController extends Controller
$uploaded = []; $uploaded = [];
if (!empty($uploadedFiles = $request->files)) { if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: [], names: [],
fileNames: [], fileNames: [],
files: $uploadedFiles, files: $uploadedFiles,
@ -321,7 +319,7 @@ final class ApiAssetController extends Controller
} }
} }
if (!empty($mediaFiles = $request->getDataJson('media'))) { $mediaFiles = $request->getDataJson('media');
foreach ($mediaFiles as $media) { foreach ($mediaFiles as $media) {
$this->createModelRelation( $this->createModelRelation(
$request->header->account, $request->header->account,
@ -333,7 +331,6 @@ final class ApiAssetController extends Controller
$request->getOrigin() $request->getOrigin()
); );
} }
}
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to asset.', [ $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Media', 'Media added to asset.', [
'upload' => $uploaded, 'upload' => $uploaded,
@ -562,8 +559,6 @@ final class ApiAssetController extends Controller
* *
* @return array<string, bool> * @return array<string, bool>
* *
* @todo Implement API validation function
*
* @since 1.0.0 * @since 1.0.0
*/ */
private function validateAssetDelete(RequestAbstract $request) : array private function validateAssetDelete(RequestAbstract $request) : array

6
Controller/BackendController.php
View File

@ -55,15 +55,13 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/AssetManagement/Theme/Backend/asset-list'); $view->setTemplate('/Modules/AssetManagement/Theme/Backend/asset-list');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006601001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1006601001, $request, $response);
$list = AssetMapper::getAll() $view->data['assets'] = AssetMapper::getAll()
->with('type') ->with('type')
->with('type/l11n') ->with('type/l11n')
->where('type/l11n/language', $response->header->l11n->language) ->where('type/l11n/language', $response->header->l11n->language)
->sort('id', 'DESC') ->sort('id', 'DESC')
->execute(); ->execute();
$view->data['assets'] = $list;
return $view; return $view;
} }
@ -139,6 +137,8 @@ final class BackendController extends Controller
$view->data['asset'] = $asset; $view->data['asset'] = $asset;
// @feature Create a new read mapper function that returns relation models instead of its own model
// https://github.com/Karaka-Management/phpOMS/issues/320
$query = new Builder($this->app->dbPool->get()); $query = new Builder($this->app->dbPool->get());
$results = $query->selectAs(AssetMapper::HAS_MANY['files']['external'], 'file') $results = $query->selectAs(AssetMapper::HAS_MANY['files']['external'], 'file')
->from(AssetMapper::TABLE) ->from(AssetMapper::TABLE)