diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3db166d..2c4ca1f 100644 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -16,6 +16,7 @@ namespace Modules\News\Controller; use Modules\Dashboard\Models\DashboardElementInterface; use Modules\News\Models\NewsArticleMapper; +use Modules\News\Models\NewsArticle; use Modules\News\Models\PermissionState; use phpOMS\Account\PermissionType; @@ -24,6 +25,7 @@ use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Views\View; +use Modules\News\Models\NewsStatus; /** * News controller class. @@ -57,16 +59,19 @@ final class BackendController extends Controller implements DashboardElementInte if ($request->getData('ptype') === '-') { $view->setData('news', NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ); } elseif ($request->getData('ptype') === '+') { $view->setData('news', NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25) ); } else { $view->setData('news', NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::getAfterPivot(0, null, 25) ); } diff --git a/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php index 928899b..0df56af 100644 --- a/Models/NewsArticleMapper.php +++ b/Models/NewsArticleMapper.php @@ -17,6 +17,7 @@ namespace Modules\News\Models; use Modules\Admin\Models\AccountMapper; use Modules\Tag\Models\TagMapper; use phpOMS\DataStorage\Database\DataMapperAbstract; +use phpOMS\DataStorage\Database\RelationType; /** * News mapper class. @@ -91,12 +92,4 @@ final class NewsArticleMapper extends DataMapperAbstract * @since 1.0.0 */ protected static string $primaryField = 'news_id'; - - /** - * Created at. - * - * @var string - * @since 1.0.0 - */ - protected static string $createdAt = 'news_created_at'; }