diff --git a/Admin/Install/Media.install.json b/Admin/Install/Media.install.json new file mode 100644 index 0000000..295b07f --- /dev/null +++ b/Admin/Install/Media.install.json @@ -0,0 +1,9 @@ +[ + { + "type": "collection", + "create_directory": true, + "name": "News", + "virtualPath": "/Modules", + "user": 1 + } +] \ No newline at end of file diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php new file mode 100644 index 0000000..b0f2632 --- /dev/null +++ b/Admin/Install/Media.php @@ -0,0 +1,43 @@ + __DIR__ . '/Media.install.json']); + } +} diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 3668166..3141b3c 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -96,6 +96,32 @@ } } }, + "news_media": { + "name": "news_media", + "fields": { + "news_media_id": { + "name": "news_media_id", + "type": "INT", + "null": false, + "primary": true, + "autoincrement": true + }, + "news_media_src": { + "name": "news_media_src", + "type": "INT", + "null": false, + "foreignTable": "news", + "foreignKey": "news_id" + }, + "news_media_dst": { + "name": "news_media_dst", + "type": "INT", + "null": false, + "foreignTable": "media", + "foreignKey": "media_id" + } + } + }, "news_seen": { "name": "news_seen", "fields": { diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 7ba717a..be35433 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -194,6 +194,20 @@ final class ApiController extends Controller } } + if (!empty($uploadedFiles = $request->getFiles() ?? [])) { + $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( + [''], + $uploadedFiles, + $request->header->account, + __DIR__ . '/../../../Modules/Media/Files/Modules/News', + '/Modules/News', + ); + + foreach ($uploaded as $media) { + $newsArticle->addMedia($media); + } + } + return $newsArticle; } diff --git a/Docs/Dev/img/er.png b/Docs/Dev/img/er.png new file mode 100644 index 0000000..2b4ac5c Binary files /dev/null and b/Docs/Dev/img/er.png differ diff --git a/Models/NewsArticle.php b/Models/NewsArticle.php index 8339c81..81e0306 100755 --- a/Models/NewsArticle.php +++ b/Models/NewsArticle.php @@ -21,6 +21,7 @@ use Modules\Tag\Models\Tag; use phpOMS\Contract\ArrayableInterface; use phpOMS\Localization\ISO639x1Enum; use phpOMS\Stdlib\Base\Exception\InvalidEnumValue; +use Modules\Media\Models\Media; /** * News article class. @@ -136,6 +137,14 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface */ public ?CommentList $comments = null; + /** + * Media files + * + * @var array + * @since 1.0.0 + */ + protected array $media = []; + /** * Constructor. * @@ -326,6 +335,32 @@ class NewsArticle implements \JsonSerializable, ArrayableInterface $this->tags[] = $tag; } + /** + * Get all media + * + * @return Media[] + * + * @since 1.0.0 + */ + public function getMedia() : array + { + return $this->media; + } + + /** + * Add media + * + * @param Media $media Media to add + * + * @return void + * + * @since 1.0.0 + */ + public function addMedia(Media $media) : void + { + $this->media[] = $media; + } + /** * {@inheritdoc} */ diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php index cf2644e..1800108 100755 --- a/Models/NewsArticleMapper.php +++ b/Models/NewsArticleMapper.php @@ -94,6 +94,12 @@ final class NewsArticleMapper extends DataMapperAbstract 'self' => 'news_tag_dst', 'external' => 'news_tag_src', ], + 'media' => [ + 'mapper' => MediaMapper::class, + 'table' => 'news_media', + 'external' => 'news_media_dst', + 'self' => 'news_media_src', + ], ]; /** diff --git a/Theme/Backend/news-single.tpl.php b/Theme/Backend/news-single.tpl.php index d9121ca..c4e5394 100755 --- a/Theme/Backend/news-single.tpl.php +++ b/Theme/Backend/news-single.tpl.php @@ -42,6 +42,10 @@ echo $this->getData('nav')->render(); ?> = $tag->icon !== null ? '' : ''; ?>= $this->printHtml($tag->getL11n()); ?> + + getMedia(); foreach ($files as $file) : ?> + = $this->printHtml($file->name); ?> +