diff --git a/.github/user_bug_report.md b/.github/user_bug_report.md index 9e5f2a5..4b92a8e 100755 --- a/.github/user_bug_report.md +++ b/.github/user_bug_report.md @@ -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. diff --git a/Controller/ApiController.php b/Controller/ApiController.php index b5d076d..7ff3a3f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -66,7 +66,7 @@ final class ApiController extends Controller private function validateAccountCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -123,7 +123,7 @@ final class ApiController extends Controller private function validateAccountUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } @@ -180,7 +180,7 @@ final class ApiController extends Controller private function validateCostCenterCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -237,7 +237,7 @@ final class ApiController extends Controller private function validateCostCenterUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } @@ -294,7 +294,7 @@ final class ApiController extends Controller private function validateCostObjectCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -351,7 +351,7 @@ final class ApiController extends Controller private function validateCostObjectUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } @@ -408,7 +408,7 @@ final class ApiController extends Controller private function validateEntryCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -465,7 +465,7 @@ final class ApiController extends Controller private function validateEntryUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } @@ -522,7 +522,7 @@ final class ApiController extends Controller private function validateRecurringEntryCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -579,7 +579,7 @@ final class ApiController extends Controller private function validateRecurringEntryUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } @@ -636,7 +636,7 @@ final class ApiController extends Controller private function validateTaxKeyCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -693,7 +693,7 @@ final class ApiController extends Controller private function validateTaxKeyUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } @@ -750,7 +750,7 @@ final class ApiController extends Controller private function validateBatchEntryCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -807,7 +807,7 @@ final class ApiController extends Controller private function validateBatchEntryUpdate(RequestAbstract $request) : array { $val = []; - if (($val['id'] = empty($request->getData('id'))) + if (($val['id'] = !$request->hasData('id')) ) { return $val; } diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index f766f6f..a9b02c0 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -58,7 +58,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase }; $this->app->dbPool = $GLOBALS['dbpool']; - $this->app->unitId = 1; + $this->app->unitId = 1; $this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->appSettings = new CoreSettings(); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/'); @@ -71,7 +71,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $permission = new AccountPermission(); $permission->setUnit(1); - $permission->setApp('backend'); + $permission->setApp(2); $permission->setPermission( PermissionType::READ | PermissionType::CREATE