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

fix templates

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-12-06 16:14:42 +01:00
parent 3279c46093
commit fdaa69abc8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/BackendController.php
View File

@ -65,17 +65,17 @@ final class BackendController extends Controller implements DashboardElementInte
if ($request->getData('ptype') === 'p') { if ($request->getData('ptype') === 'p') {
$view->setData('tasks', $view->setData('tasks',
TaskMapper::withConditional('language', $response->getLanguage()) TaskMapper::withConditional('language', $response->getLanguage())
::getAnyBeforePivot($request->header->account, (int) ($request->getData('id') ?? 0), null, 25) ::getAnyBeforePivot($request->header->account, (int) ($request->getData('id') ?? 0), limit: 25)
); );
} elseif ($request->getData('ptype') === 'n') { } elseif ($request->getData('ptype') === 'n') {
$view->setData('tasks', $view->setData('tasks',
TaskMapper::withConditional('language', $response->getLanguage()) TaskMapper::withConditional('language', $response->getLanguage())
::getAnyAfterPivot($request->header->account, (int) ($request->getData('id') ?? 0), null, 25) ::getAnyAfterPivot($request->header->account, (int) ($request->getData('id') ?? 0), limit: 25)
); );
} else { } else {
$view->setData('tasks', $view->setData('tasks',
TaskMapper::withConditional('language', $response->getLanguage()) TaskMapper::withConditional('language', $response->getLanguage())
::getAnyAfterPivot($request->header->account, 0, null, 25) ::getAnyAfterPivot($request->header->account, 0, limit: 25)
); );
} }

4
Models/TaskMapper.php
View File

@ -329,7 +329,7 @@ final class TaskMapper extends DataMapperAbstract
*/ */
public static function getAnyBeforePivot( public static function getAnyBeforePivot(
int $user, int $user,
$pivot, mixed $pivot,
string $column = null, string $column = null,
int $limit = 50, int $limit = 50,
string $order = 'ASC', string $order = 'ASC',
@ -371,7 +371,7 @@ final class TaskMapper extends DataMapperAbstract
*/ */
public static function getAnyAfterPivot( public static function getAnyAfterPivot(
int $user, int $user,
$pivot, mixed $pivot,
string $column = null, string $column = null,
int $limit = 50, int $limit = 50,
string $order = 'ASC', string $order = 'ASC',

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

@ -180,7 +180,7 @@ echo $this->getData('nav')->render(); ?>
$element->createdBy->name1, $element->createdBy->name1,
$element->createdAt->format('Y-m-d H:i') $element->createdAt->format('Y-m-d H:i')
)); ?> )); ?>
<span class="tag task-status-<?= $this->printHtml($element->getStatus()); ?>"> <span class="tag task-status-<?= $element->getStatus(); ?>">
<?= $this->getHtml('S' . $element->getStatus()); ?> <?= $this->getHtml('S' . $element->getStatus()); ?>
</span> </span>
</div> </div>
@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
$element->createdBy->name1, $element->createdBy->name1,
$element->createdAt->format('Y-m-d H:i') $element->createdAt->format('Y-m-d H:i')
)); ?> )); ?>
<span class="tag task-priority-<?= $this->printHtml($element->getPriority()); ?>"> <span class="tag task-priority-<?= $element->getPriority(); ?>">
<?= $this->getHtml('P' . $element->getPriority()); ?> <?= $this->getHtml('P' . $element->getPriority()); ?>
</span> </span>
</div> </div>