diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 62f39bb..1a00cd0 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -351,7 +351,7 @@ final class ApiController extends Controller $internalResponse = new HttpResponse(); $this->app->moduleManager->get('Tag')->apiTagCreate($request, $internalResponse); - if (!\is_array($data = $internalResponse->get($request->uri->__toString()))) { + if (!\is_array($data = $internalResponse->getDataArray($request->uri->__toString()))) { continue; } diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 5fdfd50..5e0ade0 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -21,6 +21,7 @@ use Modules\News\Models\NewsSeenMapper; use Modules\News\Models\NewsStatus; use Modules\News\Models\PermissionCategory; use phpOMS\Account\PermissionType; +use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; @@ -204,6 +205,9 @@ final class BackendController extends Controller implements DashboardElementInte if (!$article->comments !== null && $this->app->moduleManager->get('Comments')::ID > 0 ) { + $head = $response->data['Content']->head; + $head->addAsset(AssetType::CSS, 'Modules/Comments/Theme/Backend/css/styles.css'); + $commentCreateView = new \Modules\Comments\Theme\Backend\Components\Comment\CreateView($this->app->l11nManager, $request, $response); $commentListView = new \Modules\Comments\Theme\Backend\Components\Comment\ListView($this->app->l11nManager, $request, $response); diff --git a/Theme/Backend/news-draft.tpl.php b/Theme/Backend/news-draft.tpl.php index 4bb1ea9..1cb877c 100755 --- a/Theme/Backend/news-draft.tpl.php +++ b/Theme/Backend/news-draft.tpl.php @@ -89,7 +89,9 @@ echo $this->data['nav']->render(); ?> getHtml('TYPE' . $news->getType()); ?> printHtml($news->title); ?> - printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?> + + printHtml($news->createdBy->name2 . ', ' . $news->createdBy->name1); ?> + printHtml($news->publish->format('Y-m-d')); ?> diff --git a/Theme/Backend/news-single.tpl.php b/Theme/Backend/news-single.tpl.php index 20aba2b..7871524 100755 --- a/Theme/Backend/news-single.tpl.php +++ b/Theme/Backend/news-single.tpl.php @@ -33,7 +33,17 @@ echo $this->data['nav']->render(); ?>
@@ -59,7 +69,7 @@ echo $this->data['nav']->render(); ?> comments; if (!empty($commentList) && $commentList->status !== CommentListStatus::INACTIVE) : - /* @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('commentList')->render($commentList); -endif; ?> + /* @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('commentList')->render($commentList); +endif; diff --git a/tests/Controller/Api/ApiControllerNewsArticleTrait.php b/tests/Controller/Api/ApiControllerNewsArticleTrait.php index ff64a15..042311d 100755 --- a/tests/Controller/Api/ApiControllerNewsArticleTrait.php +++ b/tests/Controller/Api/ApiControllerNewsArticleTrait.php @@ -64,8 +64,8 @@ trait ApiControllerNewsArticleTrait $this->module->apiNewsCreate($request, $response); - self::assertEquals('Controller Test Title', $response->get('')['response']->title); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertEquals('Controller Test Title', $response->getDataArray('')['response']->title); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -99,7 +99,7 @@ trait ApiControllerNewsArticleTrait $this->module->apiNewsGet($request, $response); - self::assertGreaterThan(0, $response->get('')['response']->id); + self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } /** @@ -120,7 +120,7 @@ trait ApiControllerNewsArticleTrait $this->module->apiNewsUpdate($request, $response); $this->module->apiNewsGet($request, $response); - self::assertEquals('New Title', $response->get('')['response']->title); + self::assertEquals('New Title', $response->getDataArray('')['response']->title); } /** @@ -137,7 +137,7 @@ trait ApiControllerNewsArticleTrait $request->setData('id', 1); $this->module->apiNewsDelete($request, $response); - self::assertEquals(1, $response->get('')['response']->id); + self::assertEquals(1, $response->getDataArray('')['response']->id); self::assertInstanceOf(NullNewsArticle::class, NewsArticleMapper::get()->where('id', 1)->execute()); } }