Skip to content
Snippets Groups Projects
Commit 5e8d267f authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fix errors in jsonapi code, fixes #1228

Closes #1228

Merge request studip/studip!740
parent 9a21789a
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace JsonApi\Routes\News; namespace JsonApi\Routes\News;
use DateTime;
use JsonApi\Routes\TimestampTrait; use JsonApi\Routes\TimestampTrait;
trait StudipNewsDatesHelper trait StudipNewsDatesHelper
......
...@@ -6,6 +6,7 @@ use Psr\Http\Message\ServerRequestInterface as Request; ...@@ -6,6 +6,7 @@ use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use JsonApi\Errors\AuthorizationFailedException; use JsonApi\Errors\AuthorizationFailedException;
use JsonApi\Errors\InternalServerError; use JsonApi\Errors\InternalServerError;
use JsonApi\Errors\RecordNotFoundException;
/** /**
* Create a news where the range is the user himself. * Create a news where the range is the user himself.
......
...@@ -4,8 +4,10 @@ namespace JsonApi\Routes\Wiki; ...@@ -4,8 +4,10 @@ namespace JsonApi\Routes\Wiki;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use JsonApi\Errors\ConflictError; use JsonApi\Errors\AuthorizationFailedException;
use JsonApi\Errors\ConflictException;
use JsonApi\Errors\InternalServerError; use JsonApi\Errors\InternalServerError;
use JsonApi\Errors\RecordNotFoundException;
use JsonApi\JsonApiController; use JsonApi\JsonApiController;
use JsonApi\Routes\ValidationTrait; use JsonApi\Routes\ValidationTrait;
use JsonApi\Schemas\WikiPage; use JsonApi\Schemas\WikiPage;
...@@ -38,7 +40,7 @@ class WikiCreate extends JsonApiController ...@@ -38,7 +40,7 @@ class WikiCreate extends JsonApiController
$keyword = self::arrayGet($json, 'data.attributes.keyword'); $keyword = self::arrayGet($json, 'data.attributes.keyword');
if (\WikiPage::findLatestPage($range->id, $keyword)) { if (\WikiPage::findLatestPage($range->id, $keyword)) {
throw new ConflictError('Wiki page already exists.'); throw new ConflictException('Wiki page already exists.');
} }
if (!$wiki = $this->createWikiFromJSON($user, $range, $json)) { if (!$wiki = $this->createWikiFromJSON($user, $range, $json)) {
......
...@@ -4,6 +4,7 @@ namespace JsonApi\Routes\Wiki; ...@@ -4,6 +4,7 @@ namespace JsonApi\Routes\Wiki;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ResponseInterface as Response;
use JsonApi\Errors\AuthorizationFailedException;
use JsonApi\JsonApiController; use JsonApi\JsonApiController;
require_once 'lib/wiki.inc.php'; require_once 'lib/wiki.inc.php';
......
...@@ -113,7 +113,7 @@ class StudipNews extends SchemaProvider ...@@ -113,7 +113,7 @@ class StudipNews extends SchemaProvider
return $news->news_ranges->map(function ($range) use ($include) { return $news->news_ranges->map(function ($range) use ($include) {
switch ($range->type) { switch ($range->type) {
case 'global': case 'global':
return new \Jsonapi\Models\Studip(); return new \JsonApi\Models\Studip();
case 'sem': case 'sem':
return $include return $include
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment