Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-01-26 03:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Orange-Management/oms-Admin into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2020-03-25 07:50:12 +01:00
commit d1b86fc36f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -28,11 +28,13 @@ use Modules\Admin\Models\LocalizationMapper;
use Modules\Admin\Models\ModuleStatusUpdateType;
use Modules\Admin\Models\NullAccount;
use Modules\Admin\Models\PermissionState;
use phpOMS\Account\AccountStatus;
use phpOMS\Account\AccountType;
use phpOMS\Account\GroupStatus;
use phpOMS\Account\PermissionAbstract;
use phpOMS\Account\PermissionOwner;
use phpOMS\Account\PermissionType;
use phpOMS\Application\ApplicationManager;
use phpOMS\Localization\Localization;
use phpOMS\Message\Http\HttpRequest;
@ -50,8 +52,6 @@ use phpOMS\Uri\HttpUri;
use phpOMS\Utils\Parser\Markdown\Markdown;
use phpOMS\Validation\Network\Email;
use phpOMS\Version\Version;
use phpOMS\Account\PermissionType;
use Modules\Admin\Models\PermissionState;
/**
* Admin controller class.
@ -141,8 +141,8 @@ final class ApiController extends Controller
'content' => $content,
'module' => $module,
'group' => $group,
'account' => $account
]
'account' => $account,
],
], true);
},
'settings'