Jingga/oms-Kanban
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Kanban.git synced 2026-02-05 06:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Kanban into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:57:39 +00:00
commit d64d967950
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/ApiController.php
View File

@ -62,7 +62,7 @@ final class ApiController extends Controller
public function apiKanbanCardCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateKanbanCardCreate($request))) {
$response->set('kanban_card_create', new FormValidation($val));
$response->data['kanban_card_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -118,7 +118,7 @@ final class ApiController extends Controller
}
}
if (!empty($uploadedFiles = $request->getFiles())) {
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[],
[],
@ -187,7 +187,7 @@ final class ApiController extends Controller
public function apiKanbanCardCommentCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateKanbanCardCommentCreate($request))) {
$response->set('kanban_comment_create', new FormValidation($val));
$response->data['kanban_comment_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -215,7 +215,7 @@ final class ApiController extends Controller
$comment->card = (int) $request->getData('card');
$comment->createdBy = new NullAccount($request->header->account);
if (!empty($uploadedFiles = $request->getFiles())) {
if (!empty($uploadedFiles = $request->files)) {
$uploaded = $this->app->moduleManager->get('Media')->uploadFiles(
[],
[],
@ -270,7 +270,7 @@ final class ApiController extends Controller
public function apiKanbanBoardCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateKanbanBoardCreate($request))) {
$response->set('kanban_board_create', new FormValidation($val));
$response->data['kanban_board_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -412,7 +412,7 @@ final class ApiController extends Controller
public function apiKanbanColumnCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateKanbanColumnCreate($request))) {
$response->set('kanban_column_create', new FormValidation($val));
$response->data['kanban_column_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;

28
Controller/BackendController.php
View File

@ -52,7 +52,7 @@ final class BackendController extends Controller
public function setupStyles(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, '/Modules/Kanban/Theme/Backend/css/styles.css?v=1.0.0');
}
@ -73,17 +73,17 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response);
$list = KanbanBoardMapper::getAll()
->with('tags')
->with('tags/title')
->where('tags/title/language', $request->getLanguage())
->where('tags/title/language', $request->header->l11n->language)
->sort('createdAt', OrderType::DESC)
->limit(20)
->execute();
$view->setData('boards', $list);
$view->data['boards'] = $list;
return $view;
}
@ -112,7 +112,7 @@ final class BackendController extends Controller
->with('columns/cards/tags')
->with('columns/cards/tags/title')
->where('id', (int) $request->getData('id'))
->where('columns/cards/tags/title/language', $request->getLanguage())
->where('columns/cards/tags/title/language', $request->header->l11n->language)
->execute();
$accountId = $request->header->account;
@ -127,9 +127,9 @@ final class BackendController extends Controller
}
$view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-board');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response);
$view->setData('board', $board);
$view->data['board'] = $board;
return $view;
}
@ -150,17 +150,17 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-archive');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response);
$list = KanbanBoardMapper::getAll()
->with('tags')
->with('tags/title')
->where('tags/title/language', $request->getLanguage())
->where('tags/title/language', $request->header->l11n->language)
->sort('createdAt', OrderType::DESC)
->limit(25)
->execute();
$view->setData('boards', $list);
$view->data['boards'] = $list;
return $view;
}
@ -192,7 +192,7 @@ final class BackendController extends Controller
}
$view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-board-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response);
return $view;
}
@ -223,7 +223,7 @@ final class BackendController extends Controller
->with('comments/media')
->with('comments/createdBy')
->where('id', (int) $request->getData('id'))
->where('tags/title/language', $response->getLanguage())
->where('tags/title/language', $response->header->l11n->language)
->execute();
$accountId = $request->header->account;
@ -238,8 +238,8 @@ final class BackendController extends Controller
}
$view->setTemplate('/Modules/Kanban/Theme/Backend/kanban-card');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response));
$view->setData('card', $card);
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005801001, $request, $response);
$view->data['card'] = $card;
return $view;
}

4
Theme/Backend/kanban-archive.tpl.php
View File

@ -16,12 +16,12 @@ use phpOMS\Uri\UriFactory;
/** @var \phpOMS\Views\View $this */
/** @var \Modules\News\Models\NewsArticle[] $boards */
$boards = $this->getData('boards') ?? [];
$boards = $this->data['boards'] ?? [];
$previous = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \reset($boards)->id . '&ptype=p';
$next = empty($boards) ? 'kanban/archive' : 'kanban/archive?{?}&id=' . \end($boards)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<div class="col-xs-12">

2
Theme/Backend/kanban-board-create.tpl.php
View File

@ -11,4 +11,4 @@
* @link https://jingga.app
*/
declare(strict_types=1);
echo $this->getData('nav')->render();
echo $this->data['nav']->render();

2
Theme/Backend/kanban-board.tpl.php
View File

@ -13,7 +13,7 @@
declare(strict_types=1);
/** @var \Modules\Kanban\Models\KanbanBoard $board */
$board = $this->getData('board');
$board = $this->data['board'];
/** @var \Modules\Kanban\Models\KanbanColumn[] $columns */
$columns = $board->getColumns();

2
Theme/Backend/kanban-card.tpl.php
View File

@ -15,7 +15,7 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory;
/** @var \Modules\Kanban\Models\KanbanCard $card */
$card = $this->getData('card');
$card = $this->data['card'];
$comments = $card->getComments();
?>

4
Theme/Backend/kanban-dashboard.tpl.php
View File

@ -15,12 +15,12 @@ declare(strict_types=1);
use phpOMS\Uri\UriFactory;
/** @var \Modules\Kanban\Models\KanbanBoard[] $boards */
$boards = $this->getData('boards');
$boards = $this->data['boards'];
$previous = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \reset($boards)->id . '&ptype=p';
$next = empty($boards) ? 'kanban/dashboard' : 'kanban/dashboard?{?}&id=' . \end($boards)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?>
echo $this->data['nav']->render(); ?>
<div class="row">
<?php if (empty($boards)) : ?>