mirror of
https://github.com/Karaka-Management/oms-Admin.git
synced 2026-02-16 20:38:41 +00:00
bug fixes
This commit is contained in:
parent
b6b97ccdc0
commit
255aca8536
|
|
@ -718,6 +718,33 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"account_account_rel": {
|
||||||
|
"description": "Accounts can belong to other accounts. E.g. a user can belong to a company account",
|
||||||
|
"name": "account_account_rel",
|
||||||
|
"fields": {
|
||||||
|
"account_account_rel_id": {
|
||||||
|
"name": "account_account_rel_id",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"primary": true,
|
||||||
|
"autoincrement": true
|
||||||
|
},
|
||||||
|
"account_account_rel_root": {
|
||||||
|
"name": "account_account_rel_root",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"foreignTable": "account",
|
||||||
|
"foreignKey": "account_id"
|
||||||
|
},
|
||||||
|
"account_account_rel_child": {
|
||||||
|
"name": "account_account_rel_child",
|
||||||
|
"type": "INT",
|
||||||
|
"null": false,
|
||||||
|
"foreignTable": "account",
|
||||||
|
"foreignKey": "account_id"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"account_group": {
|
"account_group": {
|
||||||
"name": "account_group",
|
"name": "account_group",
|
||||||
"fields": {
|
"fields": {
|
||||||
|
|
|
||||||
|
|
@ -445,7 +445,7 @@ final class ApiController extends Controller
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public function apiInstallApplication(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
|
public static function apiInstallApplication(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
|
||||||
{
|
{
|
||||||
$appManager = new ApplicationManager($this->app->moduleManager);
|
$appManager = new ApplicationManager($this->app->moduleManager);
|
||||||
|
|
||||||
|
|
@ -461,7 +461,7 @@ final class ApiController extends Controller
|
||||||
$request->getData('theme') ?? 'Default'
|
$request->getData('theme') ?? 'Default'
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->apiActivateTheme($request, $response);
|
self::apiActivateTheme($request, $response);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -477,7 +477,7 @@ final class ApiController extends Controller
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
|
public static function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
|
||||||
{
|
{
|
||||||
if (\is_dir(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) {
|
if (\is_dir(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) {
|
||||||
Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css');
|
Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css');
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,14 @@ class Account extends \phpOMS\Account\Account
|
||||||
*/
|
*/
|
||||||
public string $tempPassword = '';
|
public string $tempPassword = '';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parents.
|
||||||
|
*
|
||||||
|
* @var Account[]
|
||||||
|
* @since 1.0.0
|
||||||
|
*/
|
||||||
|
public array $parents = [];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remaining login tries.
|
* Remaining login tries.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -80,6 +80,12 @@ final class AccountMapper extends DataMapperAbstract
|
||||||
'external' => 'account_group_group',
|
'external' => 'account_group_group',
|
||||||
'self' => 'account_group_account',
|
'self' => 'account_group_account',
|
||||||
],
|
],
|
||||||
|
'parents' => [
|
||||||
|
'mapper' => self::class,
|
||||||
|
'table' => 'account_account_rel',
|
||||||
|
'external' => 'account_account_rel_root',
|
||||||
|
'self' => 'account_account_rel_child',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user