Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-15 07:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix comment section permissions

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-12-15 01:38:45 +00:00
parent 233d5e117e
commit 8fbd97593a
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Controller/BackendController.php
View File

@ -20,6 +20,7 @@ use Modules\News\Models\NewsSeen;
use Modules\News\Models\NewsSeenMapper; use Modules\News\Models\NewsSeenMapper;
use Modules\News\Models\NewsStatus; use Modules\News\Models\NewsStatus;
use Modules\News\Models\PermissionCategory; use Modules\News\Models\PermissionCategory;
use Modules\Comments\Models\PermissionCategory as NewsPermissionCategory;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Asset\AssetType; use phpOMS\Asset\AssetType;
use phpOMS\Contract\RenderableInterface; use phpOMS\Contract\RenderableInterface;
@ -201,10 +202,9 @@ final class BackendController extends Controller implements DashboardElementInte
$view->data['editable'] = $this->app->accountManager->get($accountId)->hasPermission( $view->data['editable'] = $this->app->accountManager->get($accountId)->hasPermission(
PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::NEWS, $article->id); PermissionType::MODIFY, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::NEWS, $article->id);
// allow comments // Comments module available
if (!$article->comments !== null $commentModule = $this->app->moduleManager->get('Comments');
&& $this->app->moduleManager->get('Comments')::ID > 0 if ($commentModule::ID > 0) {
) {
$head = $response->data['Content']->head; $head = $response->data['Content']->head;
$head->addAsset(AssetType::CSS, 'Modules/Comments/Theme/Backend/css/styles.css'); $head->addAsset(AssetType::CSS, 'Modules/Comments/Theme/Backend/css/styles.css');
@ -213,6 +213,21 @@ final class BackendController extends Controller implements DashboardElementInte
$view->data['commentCreate'] = $commentCreateView; $view->data['commentCreate'] = $commentCreateView;
$view->data['commentList'] = $commentListView; $view->data['commentList'] = $commentListView;
$view->data['commentPermissions'] = [
'moderation' => $this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::MODIFY, $this->app->unitId, $this->app->appId, $commentModule::NAME, NewsPermissionCategory::MODERATION, $article->comments->id ?? null
),
'list_modify' => $this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::MODIFY, $this->app->unitId, $this->app->appId, $commentModule::NAME, NewsPermissionCategory::LIST, $article->comments->id ?? null
),
'list_read' => $this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::READ, $this->app->unitId, $this->app->appId, $commentModule::NAME, NewsPermissionCategory::LIST, $article->comments->id ?? null
),
'write' => $this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::READ, $this->app->unitId, $this->app->appId, $commentModule::NAME, NewsPermissionCategory::COMMENT, null
),
];
} }
return $view; return $view;

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

@ -71,8 +71,12 @@ echo $this->data['nav']->render(); ?>
<?php <?php
$commentList = $news->comments; $commentList = $news->comments;
if (!empty($commentList) && $commentList->status !== CommentListStatus::INACTIVE) : if ($this->data['commentPermissions']['write'] && $commentList->status === CommentListStatus::ACTIVE) :
/* @todo check if user has permission to create a comment here, maybe he is only allowed to read comments */
echo $this->getData('commentCreate')->render(1); echo $this->getData('commentCreate')->render(1);
echo $this->getData('commentList')->render($commentList); endif;
if ($this->data['commentPermissions']['list_modify']
|| ($this->data['commentPermissions']['list_read'] && $commentList->status !== CommentListStatus::INACTIVE)
) :
echo $this->getData('commentList')->render($commentList);
endif; endif;