diff --git a/Admin/Install/db.json b/Admin/Install/db.json index 188f584..4d54e13 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -94,6 +94,12 @@ "default": null, "null": true }, + "kanban_card_descriptionraw": { + "name": "kanban_card_descriptionraw", + "type": "TEXT", + "default": null, + "null": true + }, "kanban_card_type": { "name": "kanban_card_type", "type": "TINYINT", diff --git a/Controller/ApiController.php b/Controller/ApiController.php index c86a6fe..6f1767d 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -31,6 +31,7 @@ use phpOMS\Message\NotificationLevel; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; use phpOMS\Model\Message\FormValidation; +use phpOMS\Utils\Parser\Markdown\Markdown; /** * Kanban controller class. @@ -80,9 +81,10 @@ final class ApiController extends Controller */ public function createKanbanCardFromRequest(RequestAbstract $request) : KanbanCard { - $card = new KanbanCard(); - $card->name = (string) ($request->getData('title')); - $card->description = (string) ($request->getData('plain') ?? ''); + $card = new KanbanCard(); + $card->name = (string) ($request->getData('title')); + $card->description = Markdown::parse((string) ($request->getData('plain') ?? '')); + $card->descriptionRaw = (string) ($request->getData('plain') ?? ''); $card->setColumn((int) $request->getData('column')); $card->setOrder((int) ($request->getData('order') ?? 1)); $card->setRef((int) ($request->getData('ref') ?? 0)); diff --git a/Models/KanbanCard.php b/Models/KanbanCard.php index eb685ee..dac9f27 100755 --- a/Models/KanbanCard.php +++ b/Models/KanbanCard.php @@ -57,6 +57,14 @@ class KanbanCard implements \JsonSerializable */ public string $description = ''; + /** + * Description. + * + * @var string + * @since 1.0.0 + */ + public string $descriptionRaw = ''; + private int $column = 0; private int $order = 0; diff --git a/Models/KanbanCardMapper.php b/Models/KanbanCardMapper.php index 58e7f93..90b1ae3 100755 --- a/Models/KanbanCardMapper.php +++ b/Models/KanbanCardMapper.php @@ -38,6 +38,7 @@ final class KanbanCardMapper extends DataMapperAbstract 'kanban_card_id' => ['name' => 'kanban_card_id', 'type' => 'int', 'internal' => 'id'], 'kanban_card_name' => ['name' => 'kanban_card_name', 'type' => 'string', 'internal' => 'name'], 'kanban_card_description' => ['name' => 'kanban_card_description', 'type' => 'string', 'internal' => 'description'], + 'kanban_card_descriptionraw' => ['name' => 'kanban_card_descriptionraw', 'type' => 'string', 'internal' => 'descriptionRaw'], 'kanban_card_type' => ['name' => 'kanban_card_type', 'type' => 'int', 'internal' => 'type'], 'kanban_card_status' => ['name' => 'kanban_card_status', 'type' => 'int', 'internal' => 'status'], 'kanban_card_order' => ['name' => 'kanban_card_order', 'type' => 'int', 'internal' => 'order'], diff --git a/Theme/Backend/kanban-board.tpl.php b/Theme/Backend/kanban-board.tpl.php index f68807d..e0723a2 100755 --- a/Theme/Backend/kanban-board.tpl.php +++ b/Theme/Backend/kanban-board.tpl.php @@ -9,13 +9,13 @@ $columns = $board->getColumns(); -->
getCards(); ?> -
+