Bug fixes

This commit is contained in:
Dennis Eichhorn 2018-02-18 10:46:57 +01:00
parent 3452b8ef76
commit 8d01334db0
4 changed files with 77 additions and 4 deletions

View File

@ -6,7 +6,19 @@ return [
'^.*/api/news.*$' => [
[
'dest' => '\Modules\News\Controller:apiNewsCreate',
'verb' => RouteVerb::PUT,
],
[
'dest' => '\Modules\News\Controller:apiNewsUpdate',
'verb' => RouteVerb::SET,
],
[
'dest' => '\Modules\News\Controller:apiNewsGet',
'verb' => RouteVerb::GET,
],
[
'dest' => '\Modules\News\Controller:apiNewsDelete',
'verb' => RouteVerb::DELETE,
],
],
];

View File

@ -399,7 +399,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiNewsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::News)
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE)
) {
$response->set('news_read', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -548,7 +548,7 @@ class Controller extends ModuleAbstract implements WebInterface
*
* @since 1.0.0
*/
public function apiDeleteNewsArticle(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
public function apiNewsDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE)
@ -558,8 +558,15 @@ class Controller extends ModuleAbstract implements WebInterface
return;
}
NewsArticleMapper::delete((int) $request->getData('id'));
$response->set('news_delete', (int) $request->getData('id'));
$news = NewsArticleMapper::get((int) $request->getData('id'));
$status = NewsArticleMapper::delete($news);
$response->set($request->__toString(), [
'status' => 'ok',
'title' => 'News',
'message' => 'News successfully deleted.',
'response' => $status
]);
}
/**

27
Models/NullBadge.php Normal file
View File

@ -0,0 +1,27 @@
<?php
/**
* Orange Management
*
* PHP Version 7.1
*
* @package Modules\News
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://website.orange-management.de
*/
declare(strict_types=1);
namespace Modules\News\Models;
/**
* Null model
*
* @package Modules\News
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
*/
class NullBadge extends Badge
{
}

View File

@ -0,0 +1,27 @@
<?php
/**
* Orange Management
*
* PHP Version 7.1
*
* @package Modules\News
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link http://website.orange-management.de
*/
declare(strict_types=1);
namespace Modules\News\Models;
/**
* Null model
*
* @package Modules\News
* @license OMS License 1.0
* @link http://website.orange-management.de
* @since 1.0.0
*/
class NullNewsArticle extends NewsArticle
{
}