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

fix billing process

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-04-08 04:36:26 +02:00
parent d37b11f2d4
commit 953e74ce8a
5 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/user_bug_report.md vendored
View File

@ -8,9 +8,11 @@ assignees: ''
---
# Bug Description
A clear and concise description of what the bug is.
# How to Reproduce
Steps to reproduce the behavior:
1. Go to '...'
@ -19,16 +21,20 @@ Steps to reproduce the behavior:
4. See error
# Expected Behavior
A clear and concise description of what you expected to happen.
# Screenshots
If applicable, add screenshots to help explain your problem.
# System Information
- System: [e.g. PC or iPhone11, ...]
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- KarakaVersion [e.g. 22]
- System: [e.g. PC or iPhone11, ...]
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- KarakaVersion [e.g. 22]
# Additional Information
Add any other context about the problem here.

30
Controller/ApiController.php
View File

@ -71,8 +71,8 @@ final class ApiController extends Controller
private function validateTaskCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = empty($request->getData('title')))
|| ($val['plain'] = empty($request->getData('plain')))
if (($val['title'] = !$request->hasData('title'))
|| ($val['plain'] = !$request->hasData('plain'))
) {
return $val;
}
@ -294,7 +294,7 @@ final class ApiController extends Controller
$task->setType(TaskType::SINGLE);
$task->redirect = $request->getDataString('redirect') ?? '';
if (empty($request->getData('priority'))) {
if (!$request->hasData('priority')) {
$task->due = $request->getDataDateTime('due');
} else {
$task->setPriority((int) $request->getData('priority'));
@ -428,7 +428,7 @@ final class ApiController extends Controller
if (($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
|| ($val['due'] = !((bool) \strtotime((string) $request->getData('due'))))
|| ($val['task'] = !(\is_numeric($request->getData('task'))))
|| ($val['forward'] = !(\is_numeric(empty($request->getData('forward')) ? $request->header->account : $request->getData('forward'))))
|| ($val['forward'] = !(\is_numeric(!$request->hasData('forward') ? $request->header->account : $request->getData('forward'))))
) {
return $val;
}
@ -844,9 +844,9 @@ final class ApiController extends Controller
private function validateTaskAttributeCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['type'] = empty($request->getData('type')))
|| ($val['value'] = (empty($request->getData('value')) && empty($request->getData('custom'))))
|| ($val['task'] = empty($request->getData('task')))
if (($val['type'] = !$request->hasData('type'))
|| ($val['value'] = (!$request->hasData('value') && !$request->hasData('custom')))
|| ($val['task'] = !$request->hasData('task'))
) {
return $val;
}
@ -922,8 +922,8 @@ final class ApiController extends Controller
private function validateTaskAttributeTypeL11nCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = empty($request->getData('title')))
|| ($val['type'] = empty($request->getData('type')))
if (($val['title'] = !$request->hasData('title'))
|| ($val['type'] = !$request->hasData('type'))
) {
return $val;
}
@ -999,8 +999,8 @@ final class ApiController extends Controller
private function validateTaskAttributeTypeCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = empty($request->getData('title')))
|| ($val['name'] = empty($request->getData('name')))
if (($val['title'] = !$request->hasData('title'))
|| ($val['name'] = !$request->hasData('name'))
) {
return $val;
}
@ -1091,8 +1091,8 @@ final class ApiController extends Controller
private function validateTaskAttributeValueCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['attributetype'] = empty($request->getData('attributetype')))
|| ($val['value'] = empty($request->getData('value')))
if (($val['attributetype'] = !$request->hasData('attributetype'))
|| ($val['value'] = !$request->hasData('value'))
) {
return $val;
}
@ -1168,8 +1168,8 @@ final class ApiController extends Controller
private function validateTaskAttributeValueL11nCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = empty($request->getData('title')))
|| ($val['value'] = empty($request->getData('value')))
if (($val['title'] = !$request->hasData('title'))
|| ($val['value'] = !$request->hasData('value'))
) {
return $val;
}

2
Controller/BackendController.php
View File

@ -207,7 +207,7 @@ final class BackendController extends Controller implements DashboardElementInte
|| $task->isCCAccount($accountId)
|| $task->isToAccount($accountId))
&& !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->unitId, $this->app->appName, self::NAME, PermissionCategory::TASK, $task->getId())
PermissionType::READ, $this->app->unitId, $this->app->appId, self::NAME, PermissionCategory::TASK, $task->getId())
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->header->status = RequestStatusCode::R_403;

2
tests/Controller/ApiControllerTest.php
View File

@ -65,7 +65,7 @@ final class ControllerTest extends \PHPUnit\Framework\TestCase
$permission = new AccountPermission();
$permission->setUnit(1);
$permission->setApp('backend');
$permission->setApp(2);
$permission->setPermission(
PermissionType::READ
| PermissionType::CREATE

2
tests/Controller/BackendControllerTest.php
View File

@ -59,7 +59,7 @@ final class BackendControllerTest extends \PHPUnit\Framework\TestCase
$permission = new AccountPermission();
$permission->setUnit(1);
$permission->setApp('backend');
$permission->setApp(2);
$permission->setPermission(
PermissionType::READ
| PermissionType::CREATE