Jingga/oms-Knowledgebase
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Knowledgebase.git synced 2026-02-14 17:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-01-26 22:08:40 +01:00
commit 7ae41ac434
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Controller/ApiController.php
View File

@ -22,7 +22,6 @@ use Modules\Knowledgebase\Models\NullWikiCategory;
use Modules\Knowledgebase\Models\WikiApp; use Modules\Knowledgebase\Models\WikiApp;
use Modules\Knowledgebase\Models\WikiAppMapper; use Modules\Knowledgebase\Models\WikiAppMapper;
use Modules\Knowledgebase\Models\WikiCategory; use Modules\Knowledgebase\Models\WikiCategory;
use phpOMS\Localization\BaseStringL11n;
use Modules\Knowledgebase\Models\WikiCategoryL11nMapper; use Modules\Knowledgebase\Models\WikiCategoryL11nMapper;
use Modules\Knowledgebase\Models\WikiCategoryMapper; use Modules\Knowledgebase\Models\WikiCategoryMapper;
use Modules\Knowledgebase\Models\WikiDoc; use Modules\Knowledgebase\Models\WikiDoc;
@ -35,6 +34,7 @@ use Modules\Media\Models\NullMedia;
use Modules\Media\Models\Reference; use Modules\Media\Models\Reference;
use Modules\Media\Models\ReferenceMapper; use Modules\Media\Models\ReferenceMapper;
use Modules\Tag\Models\NullTag; use Modules\Tag\Models\NullTag;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\ISO639x1Enum; use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Message\Http\HttpResponse; use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\Http\RequestStatusCode;
@ -342,7 +342,7 @@ final class ApiController extends Controller
private function createWikiCategoryL11nFromRequest(RequestAbstract $request) : BaseStringL11n private function createWikiCategoryL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{ {
$l11nWikiCategory = new BaseStringL11n(); $l11nWikiCategory = new BaseStringL11n();
$l11nWikiCategory->ref = (int) ($request->getData('category') ?? 0); $l11nWikiCategory->ref = (int) ($request->getData('category') ?? 0);
$l11nWikiCategory->setLanguage((string) ( $l11nWikiCategory->setLanguage((string) (
$request->getData('language') ?? $request->getLanguage() $request->getData('language') ?? $request->getLanguage()
)); ));

4
Models/WikiCategory.php
View File

@ -14,8 +14,8 @@ declare(strict_types=1);
namespace Modules\Knowledgebase\Models; namespace Modules\Knowledgebase\Models;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\BaseStringL11n; use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\ISO639x1Enum;
/** /**
* Wiki category class. * Wiki category class.
@ -121,7 +121,7 @@ class WikiCategory implements \JsonSerializable
} elseif ($this->name instanceof BaseStringL11n) { } elseif ($this->name instanceof BaseStringL11n) {
$this->name->content = $name; $this->name->content = $name;
} else { } else {
$this->name = new BaseStringL11n(); $this->name = new BaseStringL11n();
$this->name->content = $name; $this->name->content = $name;
$this->name->setLanguage($lang); $this->name->setLanguage($lang);
} }