Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-07 08:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-06-05 11:01:03 +02:00
parent b6b97ccdc0
commit 255aca8536
4 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Admin/Install/db.json
View File

@ -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": {
"name": "account_group",
"fields": {

6
Controller/ApiController.php
View File

@ -445,7 +445,7 @@ final class ApiController extends Controller
*
* @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);
@ -461,7 +461,7 @@ final class ApiController extends Controller
$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
*/
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')) {
Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css');

8
Models/Account.php
View File

@ -40,6 +40,14 @@ class Account extends \phpOMS\Account\Account
*/
public string $tempPassword = '';
/**
* Parents.
*
* @var Account[]
* @since 1.0.0
*/
public array $parents = [];
/**
* Remaining login tries.
*

6
Models/AccountMapper.php
View File

@ -80,6 +80,12 @@ final class AccountMapper extends DataMapperAbstract
'external' => 'account_group_group',
'self' => 'account_group_account',
],
'parents' => [
'mapper' => self::class,
'table' => 'account_account_rel',
'external' => 'account_account_rel_root',
'self' => 'account_account_rel_child',
],
];
/**