Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-01-11 15:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix changes

Browse Source
This commit is contained in:
Dennis Eichhorn 2017-09-05 18:47:24 +02:00
parent 1dca6997cd
commit f45054fa58
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller.php
View File

@ -238,14 +238,14 @@ class Controller extends ModuleAbstract implements WebInterface
$task = new Task();
$task->setTitle($request->getData('title') ?? '');
$task->setDescription($request->getData('description') ?? '');
$task->setCreatedBy($request->getAccount());
$task->setCreatedBy($request->getHeader()->getAccount());
$task->setCreatedAt(new \DateTime('now'));
$task->setDue(new \DateTime($request->getData('due') ?? 'now'));
$task->setStatus(TaskStatus::OPEN);
$task->setType(TaskType::SINGLE);
$element = new TaskElement();
$element->setForwarded($request->getData('forward') ?? $request->getAccount());
$element->setForwarded($request->getData('forward') ?? $request->getHeader()->getAccount());
$element->setCreatedAt($task->getCreatedAt());
$element->setCreatedBy($task->getCreatedBy());
$element->setDue($task->getDue());
@ -263,7 +263,7 @@ class Controller extends ModuleAbstract implements WebInterface
($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
|| ($val['due'] = !((bool)strtotime($request->getData('due'))))
|| ($val['task'] = !(is_numeric($request->getData('task'))))
|| ($val['forward'] = !(is_numeric(empty($request->getData('forward')) ? $request->getAccount() : $request->getData('forward'))))
|| ($val['forward'] = !(is_numeric(empty($request->getData('forward')) ? $request->getHeader()->getAccount() : $request->getData('forward'))))
) { // todo: validate correct task
return $val;
}
@ -297,9 +297,9 @@ class Controller extends ModuleAbstract implements WebInterface
private function createTaskElementFromRequest(RequestAbstract $request) : TaskElement
{
$element = new TaskElement();
$element->setForwarded($request->getData('forward') ?? $request->getAccount());
$element->setForwarded($request->getData('forward') ?? $request->getHeader()->getAccount());
$element->setCreatedAt(new \DateTime('now'));
$element->setCreatedBy($request->getAccount());
$element->setCreatedBy($request->getHeader()->getAccount());
$element->setDue(new \DateTime($request->getData('due') ?? 'now'));
$element->setStatus($request->getData('status'));
$element->setTask($request->getData('task'));

4
Theme/Backend/task-single.tpl.php
View File

@ -42,7 +42,7 @@ echo $this->getData('nav')->render(); ?>
<div class="inner">
<div class="pAlignTable">
<div class="vCenterTable wf-100">Created <?= htmlspecialchars($task->getCreatedBy()->getName1(), ENT_COMPAT, 'utf-8'); ?></div>
<span class="vCenterTable nobreak tag <?= htmlspecialchars($color, ENT_COMPAT, 'utf-8'); ?>"><?= $this->getHtml('S' . $task->getStatus()) ?></span>
<span class="vCenterTable nobreak tag"><?= $this->getHtml('S' . $task->getStatus()) ?></span>
</div>
</div>
</section>
@ -98,7 +98,7 @@ echo $this->getData('nav')->render(); ?>
<option value="<?= htmlspecialchars(\Modules\Tasks\Models\TaskStatus::DONE, ENT_COMPAT, 'utf-8'); ?>">Done
</select>
<tr><td><label for="iReceiver"><?= $this->getHtml('To') ?></label>
<tr><td><input type="text" id="iReceiver" name="forward" value="<?= htmlspecialchars($this->request->getAccount(), ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf007; Guest">
<tr><td><input type="text" id="iReceiver" name="forward" value="<?= htmlspecialchars($this->request->getHeader()->getAccount(), ENT_COMPAT, 'utf-8'); ?>" placeholder="&#xf007; Guest">
<tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
<tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
<tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>