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

bug fixes / dbmapper fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-12-19 20:20:39 +01:00
parent 50eb9604c4
commit d444cb9c69
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Controller/BackendController.php
View File

@ -186,7 +186,7 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-list'); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-category-list');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
$list = WikiCategoryMapper::getByApp($app)->where('name/language', $response->getLanguage())->execute(); $list = WikiCategoryMapper::getAll()->with('name')->where('app', $app)->where('name/language', $response->getLanguage())->execute();
$view->setData('categories', $list); $view->setData('categories', $list);
return $view; return $view;
@ -298,7 +298,14 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-single'); $view->setTemplate('/Modules/Knowledgebase/Theme/Backend/wiki-doc-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005901001, $request, $response));
$categories = WikiCategoryMapper::getByParentAndApp($request->hasData('category') ? (int) $request->getData('category') : null, $app)->where('name/language', $response->getLanguage())->execute();; $categories = WikiCategoryMapper::getByParentAndApp(
$request->hasData('category')
? (int) $request->getData('category')
: null,
$app)
->where('name/language', $response->getLanguage())
->execute();
$view->setData('categories', $categories); $view->setData('categories', $categories);
$view->setData('document', $document); $view->setData('document', $document);
$view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission( $view->addData('editable', $this->app->accountManager->get($accountId)->hasPermission(

28
Models/WikiCategoryMapper.php
View File

@ -34,10 +34,10 @@ final class WikiCategoryMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'wiki_category_id' => ['name' => 'wiki_category_id', 'type' => 'int', 'internal' => 'id'], 'wiki_category_id' => ['name' => 'wiki_category_id', 'type' => 'int', 'internal' => 'id'],
'wiki_category_app' => ['name' => 'wiki_category_app', 'type' => 'int', 'internal' => 'app'], 'wiki_category_app' => ['name' => 'wiki_category_app', 'type' => 'int', 'internal' => 'app'],
'wiki_category_virtual' => ['name' => 'wiki_category_virtual', 'type' => 'string', 'internal' => 'virtualPath'], 'wiki_category_virtual' => ['name' => 'wiki_category_virtual', 'type' => 'string', 'internal' => 'virtualPath'],
'wiki_category_parent' => ['name' => 'wiki_category_parent', 'type' => 'int', 'internal' => 'parent'], 'wiki_category_parent' => ['name' => 'wiki_category_parent', 'type' => 'int', 'internal' => 'parent'],
]; ];
/** /**
@ -48,11 +48,11 @@ final class WikiCategoryMapper extends DataMapperFactory
*/ */
public const HAS_MANY = [ public const HAS_MANY = [
'name' => [ 'name' => [
'mapper' => WikiCategoryL11nMapper::class, 'mapper' => WikiCategoryL11nMapper::class,
'table' => 'wiki_category_l11n', 'table' => 'wiki_category_l11n',
'self' => 'wiki_category_l11n_category', 'self' => 'wiki_category_l11n_category',
'column' => 'name', 'column' => 'name',
'external' => null, 'external' => null,
], ],
]; ];
@ -64,12 +64,12 @@ final class WikiCategoryMapper extends DataMapperFactory
*/ */
public const BELONGS_TO = [ public const BELONGS_TO = [
'parent' => [ 'parent' => [
'mapper' => self::class, 'mapper' => self::class,
'external' => 'wiki_category_parent', 'external' => 'wiki_category_parent',
], ],
'app' => [ 'app' => [
'mapper' => WikiAppMapper::class, 'mapper' => WikiAppMapper::class,
'external' => 'wiki_category_app', 'external' => 'wiki_category_app',
], ],
]; ];
@ -101,7 +101,7 @@ final class WikiCategoryMapper extends DataMapperFactory
* Get by parent. * Get by parent.
* *
* @param null|int $value Parent value id * @param null|int $value Parent value id
* @param int $app App * @param int $app App
* *
* @return ReadMapper * @return ReadMapper
* *

1
Models/WikiDocMapper.php
View File

@ -17,7 +17,6 @@ namespace Modules\Knowledgebase\Models;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Tag\Models\TagMapper; use Modules\Tag\Models\TagMapper;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\DataStorage\Database\Query\Builder;
/** /**
* Mapper class. * Mapper class.