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

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Organization into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-09-24 20:30:30 +00:00
commit a8aa6c91fd
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Controller/ApiAddressAttributeController.php
View File

@ -447,7 +447,6 @@ final class ApiAddressAttributeController extends Controller
*/ */
public function apiAddressAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiAddressAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
return;
// @todo: I don't think values can be deleted? Only Attributes // @todo: I don't think values can be deleted? Only Attributes
// However, It should be possible to remove UNUSED default values // However, It should be possible to remove UNUSED default values
// either here or other function? // either here or other function?

1
Controller/ApiAttributeController.php
View File

@ -447,7 +447,6 @@ final class ApiAttributeController extends Controller
*/ */
public function apiUnitAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiUnitAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
return;
// @todo: I don't think values can be deleted? Only Attributes // @todo: I don't think values can be deleted? Only Attributes
// However, It should be possible to remove UNUSED default values // However, It should be possible to remove UNUSED default values
// either here or other function? // either here or other function?

6
Models/Attribute/AddressAttributeMapper.php
View File

@ -37,10 +37,10 @@ final class AddressAttributeMapper extends DataMapperFactory
* @since 1.0.0 * @since 1.0.0
*/ */
public const COLUMNS = [ public const COLUMNS = [
'address_attr_id' => ['name' => 'address_attr_id', 'type' => 'int', 'internal' => 'id'], 'address_attr_id' => ['name' => 'address_attr_id', 'type' => 'int', 'internal' => 'id'],
'address_attr_address' => ['name' => 'address_attr_address', 'type' => 'int', 'internal' => 'ref'], 'address_attr_address' => ['name' => 'address_attr_address', 'type' => 'int', 'internal' => 'ref'],
'address_attr_type' => ['name' => 'address_attr_type', 'type' => 'int', 'internal' => 'type'], 'address_attr_type' => ['name' => 'address_attr_type', 'type' => 'int', 'internal' => 'type'],
'address_attr_value' => ['name' => 'address_attr_value', 'type' => 'int', 'internal' => 'value'], 'address_attr_value' => ['name' => 'address_attr_value', 'type' => 'int', 'internal' => 'value'],
]; ];
/** /**

2
tests/Controller/ApiControllerTest.php
View File

@ -66,7 +66,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$account = new Account(); $account = new Account();
TestUtils::setMember($account, 'id', 1); TestUtils::setMember($account, 'id', 1);
$permission = new AccountPermission(); $permission = new AccountPermission();
$permission->unit = 1; $permission->unit = 1;
$permission->app = 2; $permission->app = 2;
$permission->setPermission( $permission->setPermission(