This commit is contained in:
Dennis Eichhorn 2018-02-03 13:09:09 +01:00
parent 33cdfb7ef6
commit baac2fdcd0
9 changed files with 21 additions and 27 deletions

View File

@ -19,7 +19,6 @@ use phpOMS\Module\UpdateAbstract;
use phpOMS\System\File\Directory; use phpOMS\System\File\Directory;
use phpOMS\Module\InfoManager; use phpOMS\Module\InfoManager;
/** /**
* Navigation class. * Navigation class.
* *

View File

@ -160,7 +160,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$board = KanbanBoardMapper::get((int) $request->getData('id')); $board = KanbanBoardMapper::get((int) $request->getData('id'));
$accountId = $request->getHeader()->getAccount(); $accountId = $request->getHeader()->getAccount();
if ($board->getCreatedBy()->getId() !== $accountId if ($board->getCreatedBy()->getId() !== $accountId
@ -224,7 +224,7 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
$card = KanbanCardMapper::get((int) $request->getData('id')); $card = KanbanCardMapper::get((int) $request->getData('id'));
$accountId = $request->getHeader()->getAccount(); $accountId = $request->getHeader()->getAccount();
if ($card->getCreatedBy()->getId() !== $accountId if ($card->getCreatedBy()->getId() !== $accountId
@ -284,8 +284,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateKanbanCardCreate(RequestAbstract $request) : array private function validateKanbanCardCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if ( if (($val['title'] = empty($request->getData('title')))
($val['title'] = empty($request->getData('title')))
|| ($val['plain'] = empty($request->getData('plain'))) || ($val['plain'] = empty($request->getData('plain')))
|| ($val['column'] = empty($request->getData('column'))) || ($val['column'] = empty($request->getData('column')))
|| ($val['order'] = empty($request->getData('order'))) || ($val['order'] = empty($request->getData('order')))
@ -343,8 +342,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateKanbanBoardCreate(RequestAbstract $request) : array private function validateKanbanBoardCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if ( if (($val['title'] = empty($request->getData('title')))
($val['title'] = empty($request->getData('title')))
|| ($val['plain'] = empty($request->getData('plain'))) || ($val['plain'] = empty($request->getData('plain')))
|| ($val['order'] = empty($request->getData('order'))) || ($val['order'] = empty($request->getData('order')))
|| ($val['status'] = ( || ($val['status'] = (
@ -393,8 +391,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateKanbanColumnCreate(RequestAbstract $request) : array private function validateKanbanColumnCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if ( if (($val['title'] = empty($request->getData('title')))
($val['title'] = empty($request->getData('title')))
|| ($val['order'] = empty($request->getData('order'))) || ($val['order'] = empty($request->getData('order')))
) { ) {
return $val; return $val;
@ -439,8 +436,7 @@ class Controller extends ModuleAbstract implements WebInterface
private function validateKanbanLabelCreate(RequestAbstract $request) : array private function validateKanbanLabelCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if ( if (($val['title'] = empty($request->getData('title')))
($val['title'] = empty($request->getData('title')))
|| ($val['board'] = empty($request->getData('board'))) || ($val['board'] = empty($request->getData('board')))
|| ($val['color'] = empty($request->getData('color'))) || ($val['color'] = empty($request->getData('color')))
) { ) {

View File

@ -26,11 +26,11 @@ use phpOMS\Stdlib\Base\Enum;
*/ */
abstract class CardType extends Enum abstract class CardType extends Enum
{ {
/* public */ const TEXT = 1; /* Markdown -> Image, links, charts etc */ /* public */ const TEXT = 1; /* Markdown -> Image, links, charts etc */
/* public */ const CALENDAR = 2; /* public */ const CALENDAR = 2;
/* public */ const CALENDAR_EVENT = 4; /* public */ const CALENDAR_EVENT = 4;
/* public */ const TASK = 8; /* public */ const TASK = 8;
/* public */ const TASK_CHECKLIST = 16; /* public */ const TASK_CHECKLIST = 16;
/* public */ const MEDIA = 32; /* public */ const MEDIA = 32;
/* public */ const SURVEY = 64; /* public */ const SURVEY = 64;
} }

View File

@ -14,7 +14,6 @@ declare(strict_types = 1);
namespace Modules\Kanban\Models; namespace Modules\Kanban\Models;
/** /**
* Task class. * Task class.
* *

View File

@ -27,8 +27,8 @@ use phpOMS\Stdlib\Base\Enum;
abstract class PermissionState extends Enum abstract class PermissionState extends Enum
{ {
/* public */ const DASHBOARD = 1; /* public */ const DASHBOARD = 1;
/* public */ const BOARD = 2; /* public */ const BOARD = 2;
/* public */ const COLUMN = 3; /* public */ const COLUMN = 3;
/* public */ const CARD = 4; /* public */ const CARD = 4;
/* public */ const LABEL = 4; /* public */ const LABEL = 4;
} }