Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-10 05:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix username rendering and recursive collection creation

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-11 23:23:03 +01:00
parent f4e5271ded
commit 169c7031ce
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Controller/ApiController.php
View File

@ -188,12 +188,16 @@ final class ApiController extends Controller
ReferenceMapper::create()->execute($ref);
if ($collection === null) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()
);
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullMedia) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$accountPath,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files/Accounts/' . $account->getId() . '/News/' . $news->createdAt->format('Y') . '/' . $news->createdAt->format('m') . '/' . $news->getId()
);
}
}
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());
@ -214,12 +218,16 @@ final class ApiController extends Controller
ReferenceMapper::create()->execute($ref);
if ($collection === null) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
$collection = MediaMapper::getParentCollection($path)->limit(1)->execute();
if ($collection instanceof NullMedia) {
$collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
'/Modules/Media/Files',
$path,
$request->header->account,
__DIR__ . '/../../../Modules/Media/Files' . $path
);
}
}
CollectionMapper::writer()->createRelationTable('sources', [$ref->getId()], $collection->getId());

2
Theme/Backend/news-dashboard.tpl.php
View File

@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?>
<?= !($isSeen = \in_array($news->getId(), $seen)) ? '<strong>' : ''; ?>
<a href="<?= $url; ?>"><?= $this->printHtml($news->title); ?></a>
<span class="floatRight">
<a class="content" href="<?= $profile; ?>"><?= $this->printHtml($news->createdBy->name3 . ' ' . $news->createdBy->name2 . ' ' . $news->createdBy->name1); ?>
<a class="content" href="<?= $profile; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$news->createdBy->name1, $news->createdBy->name2, $news->createdBy->name3, $news->createdBy->login ?? ''])); ?>
</a> - <?= $news->publish->format('Y-m-d'); ?>
</span>
<?= !$isSeen ? '</strong>' : ''; ?>

2
Theme/Backend/news-single.tpl.php
View File

@ -32,7 +32,7 @@ echo $this->getData('nav')->render(); ?>
<div class="col-xs-12">
<section class="portlet">
<article>
<h1><?= $this->printHtml($news->title); ?><span class="floatRight"><a href="<?= $profile; ?>"><?= $this->printHtml($news->createdBy->name3 . ' ' . $news->createdBy->name2 . ' ' . $news->createdBy->name1); ?></a> - <?= $news->publish->format('Y-m-d'); ?></span></h1>
<h1><?= $this->printHtml($news->title); ?><span class="floatRight"><a href="<?= $profile; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$news->createdBy->name1, $news->createdBy->name2, $news->createdBy->name3, $news->createdBy->login ?? ''])); ?></a> - <?= $news->publish->format('Y-m-d'); ?></span></h1>
<?= $news->content; ?>
</article>
<?php if ($editable || !empty($tags)) : ?>