mirror of
https://github.com/Karaka-Management/oms-ClientManagement.git
synced 2026-02-10 05:48:43 +00:00
Merge branch 'develop' of https://github.com/Karaka-Management/oms-ClientManagement into develop
This commit is contained in:
commit
a95a576b48
|
|
@ -447,7 +447,6 @@ final class ApiAttributeController extends Controller
|
||||||
*/
|
*/
|
||||||
public function apiClientAttributeValueDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
|
public function apiClientAttributeValueDelete(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?
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,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(
|
||||||
|
|
@ -87,7 +87,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
|
||||||
$this->app->accountManager->add($account);
|
$this->app->accountManager->add($account);
|
||||||
$this->app->router = new WebRouter();
|
$this->app->router = new WebRouter();
|
||||||
|
|
||||||
$this->module = $this->app->moduleManager->get('ClientManagement', 'Api');
|
$this->module = $this->app->moduleManager->get('ClientManagement', 'Api');
|
||||||
$this->attrModule = $this->app->moduleManager->get('ClientManagement', 'ApiAttribute');
|
$this->attrModule = $this->app->moduleManager->get('ClientManagement', 'ApiAttribute');
|
||||||
|
|
||||||
TestUtils::setMember($this->module, 'app', $this->app);
|
TestUtils::setMember($this->module, 'app', $this->app);
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ namespace Modules\ClientManagement\tests\Models;
|
||||||
use Modules\ClientManagement\Models\Client;
|
use Modules\ClientManagement\Models\Client;
|
||||||
use Modules\ClientManagement\Models\ClientStatus;
|
use Modules\ClientManagement\Models\ClientStatus;
|
||||||
use Modules\Editor\Models\EditorDoc;
|
use Modules\Editor\Models\EditorDoc;
|
||||||
use Modules\Media\Models\Media;
|
|
||||||
use Modules\Profile\Models\ContactElement;
|
use Modules\Profile\Models\ContactElement;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user