mirror of
https://github.com/Karaka-Management/oms-Tasks.git
synced 2026-01-10 15:18:40 +00:00
bug fixes
This commit is contained in:
parent
99bcc12abd
commit
65a785ce87
|
|
@ -128,7 +128,7 @@ final class BackendController extends Controller implements DashboardElementInte
|
|||
}
|
||||
|
||||
// given
|
||||
// @todo: this should also include forwarded tasks
|
||||
// @todo this should also include forwarded tasks
|
||||
/** @var \Modules\Tasks\Models\Task[] $given */
|
||||
$given = TaskMapper::getAll()
|
||||
->with('createdBy')
|
||||
|
|
|
|||
2
ICAL.txt
2
ICAL.txt
|
|
@ -1,6 +1,6 @@
|
|||
# Individual Contributor License Agreement ("CLA") 1.0
|
||||
|
||||
Thank you for your interest in Karaka-Management (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose.
|
||||
Thank you for your interest in Jingga e. K. (the "Company"). In order to clarify the intellectual property license granted with Contributions from any person or entity, the Company must provide a Contributor License Agreement ("CLA") on file that has been made available to each Contributor. This license is for your protection as a Contributor as well as the protection of the Company and its users; it does not change your rights to use your own Contributions for any other purpose.
|
||||
|
||||
By contributing to the Company You accept and agree to the following terms and conditions for Your present and future Contributions submitted to the Company. In return, the Company shall not use Your Contributions in a way that is contrary to the public benefit or inconsistent with its bylaws in effect at the time of the Contribution. Except for the license granted herein to the Company and recipients of software distributed by the Company, You reserve all right, title, and interest in and to Your Contributions.
|
||||
|
||||
|
|
|
|||
|
|
@ -335,6 +335,22 @@ final class TaskMapper extends DataMapperFactory
|
|||
->orWhere(self::TABLE . '_d1.task_created_by', '=', $user)
|
||||
->groupBy(self::PRIMARYFIELD);
|
||||
|
||||
// @todo Improving query performance by using raw queries and result arrays for large responses like this
|
||||
$sql = <<<SQL
|
||||
SELECT DISTINCT task.*, account.*
|
||||
FROM task
|
||||
INNER JOIN task_element ON task.task_id = task_element.task_element_task
|
||||
INNER JOIN task_account ON task_element.task_element_id = task_account.task_account_task_element
|
||||
INNER JOIN account ON task.task_created_by = account.account_id
|
||||
WHERE
|
||||
task.task_status != 1
|
||||
AND (
|
||||
task_account.task_account_account = $user
|
||||
OR task.task_created_by = $user
|
||||
)
|
||||
LIMIT 25;
|
||||
SQL;
|
||||
|
||||
return self::getAll()->query($query);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ echo $this->data['nav']->render(); ?>
|
|||
<?php if ($task->isEditable) : ?>
|
||||
<template id="taskElementContentTpl">
|
||||
<div class="taskElement-content">
|
||||
<!-- todo: bind js after adding template -->
|
||||
<!-- @todo bind js after adding template -->
|
||||
<?= $this->getData('editor')->render('task-element-edit'); ?>
|
||||
<?= $this->getData('editor')->getData('text')->render(
|
||||
'task-element-edit',
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user