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 91ae538..f686e59 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -126,8 +126,8 @@ final class ApiController extends Controller private function validateSupplierCreate(RequestAbstract $request) : array { $val = []; - if (($val['number'] = empty($request->getData('number'))) - || ($val['name1'] = empty($request->getData('name1'))) + if (($val['number'] = !$request->hasData('number')) + || ($val['name1'] = !$request->hasData('name1')) ) { return $val; } @@ -196,9 +196,9 @@ final class ApiController extends Controller private function validateSupplierL11nCreate(RequestAbstract $request) : array { $val = []; - if (($val['supplier'] = empty($request->getData('supplier'))) - || ($val['type'] = empty($request->getData('type'))) - || ($val['description'] = empty($request->getData('description'))) + if (($val['supplier'] = !$request->hasData('supplier')) + || ($val['type'] = !$request->hasData('type')) + || ($val['description'] = !$request->hasData('description')) ) { return $val; } @@ -263,7 +263,7 @@ final class ApiController extends Controller private function validateSupplierL11nTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title')))) { + if (($val['title'] = !$request->hasData('title'))) { return $val; } @@ -328,9 +328,9 @@ final class ApiController extends Controller private function validateSupplierAttributeCreate(RequestAbstract $request) : array { $val = []; - if (($val['type'] = empty($request->getData('type'))) - || ($val['value'] = empty($request->getData('value'))) - || ($val['supplier'] = empty($request->getData('supplier'))) + if (($val['type'] = !$request->hasData('type')) + || ($val['value'] = !$request->hasData('value')) + || ($val['supplier'] = !$request->hasData('supplier')) ) { return $val; } @@ -398,8 +398,8 @@ final class ApiController extends Controller private function validateSupplierAttributeTypeL11nCreate(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; } @@ -469,8 +469,8 @@ final class ApiController extends Controller private function validateSupplierAttributeTypeCreate(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; } @@ -554,8 +554,8 @@ final class ApiController extends Controller private function validateSupplierAttributeValueCreate(RequestAbstract $request) : array { $val = []; - if (($val['type'] = empty($request->getData('type'))) - || ($val['value'] = empty($request->getData('value'))) + if (($val['type'] = !$request->hasData('type')) + || ($val['value'] = !$request->hasData('value')) ) { return $val; } @@ -623,8 +623,8 @@ final class ApiController extends Controller private function validateSupplierAttributeValueL11nCreate(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; } diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 5db8ed6..ecd2072 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -69,7 +69,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