diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 4d2591d..3b9ab31 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -19,6 +19,8 @@ use Modules\Admin\Models\AccountCredentialMapper; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountPermission; use Modules\Admin\Models\AccountPermissionMapper; +use Modules\Admin\Models\App; +use Modules\Admin\Models\AppMapper; use Modules\Admin\Models\Group; use Modules\Admin\Models\GroupMapper; use Modules\Admin\Models\GroupPermission; @@ -33,9 +35,6 @@ use Modules\Admin\Models\SettingsEnum; use Modules\Media\Models\Collection; use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\UploadFile; -use Modules\Admin\Models\App; -use phpOMS\Application\ApplicationType; -use Modules\Admin\Models\AppMapper; use phpOMS\Account\AccountStatus; use phpOMS\Account\AccountType; use phpOMS\Account\GroupStatus; @@ -44,6 +43,7 @@ use phpOMS\Account\PermissionOwner; use phpOMS\Account\PermissionType; use phpOMS\Application\ApplicationInfo; use phpOMS\Application\ApplicationManager; +use phpOMS\Application\ApplicationType; use phpOMS\Auth\LoginReturnType; use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Localization\Localization; diff --git a/Models/AppMapper.php b/Models/AppMapper.php index 80c2bb1..163bf7e 100755 --- a/Models/AppMapper.php +++ b/Models/AppMapper.php @@ -37,7 +37,7 @@ final class AppMapper extends DataMapperFactory 'app_name' => ['name' => 'app_name', 'type' => 'string', 'internal' => 'name'], 'app_theme' => ['name' => 'app_theme', 'type' => 'string', 'internal' => 'theme'], 'app_status' => ['name' => 'app_status', 'type' => 'int', 'internal' => 'status'], - 'app_type' => ['name' => 'app_type', 'type' => 'int', 'internal' => 'type'], + 'app_type' => ['name' => 'app_type', 'type' => 'int', 'internal' => 'type'], ]; /**