diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index 3ad93f2..852f38f 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Profiles", - "uri": "{/base}/profile/list?{?}", + "uri": "{/base}/profile/list", "target": "self", "icon": null, "order": 10, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/base}/profile/list?{?}", + "uri": "{/base}/profile/list", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 5, "subtype": 1, "name": "Profile", - "uri": "{/base}/profile/view/front?{?}", + "uri": "{/base}/profile/view/front", "target": "self", "icon": null, "order": 3, @@ -49,7 +49,7 @@ "type": 5, "subtype": 1, "name": "Settings", - "uri": "{/base}/profile/view/settings?{?}", + "uri": "{/base}/profile/view/settings", "target": "self", "icon": null, "order": 999, @@ -66,7 +66,7 @@ "type": 3, "subtype": 1, "name": "Overview", - "uri": "{/base}/admin/module/settings?{?}", + "uri": "{/base}/admin/module/settings", "target": "self", "icon": null, "order": 1, @@ -81,7 +81,7 @@ "type": 3, "subtype": 1, "name": "Settings", - "uri": "{/base}/admin/module/settings/view/settings?{?}", + "uri": "{/base}/admin/module/settings/view/settings", "target": "self", "icon": null, "order": 1, @@ -96,7 +96,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/base}/admin/module/settings/view/create?{?}", + "uri": "{/base}/admin/module/settings/view/create", "target": "self", "icon": null, "order": 2, diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php index 3cb8154..f4400c2 100644 --- a/Admin/Install/SearchCommands.php +++ b/Admin/Install/SearchCommands.php @@ -22,6 +22,7 @@ return [ [ 'dest' => '\Modules\Profile\Controller\SearchController:searchGeneral', 'verb' => RouteVerb::ANY, + 'active' => true, 'permission' => [ 'module' => SearchController::NAME, 'type' => PermissionType::READ, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 60e54e7..b7576bf 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -16,7 +16,6 @@ namespace Modules\Profile\Controller; use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\ContactType; -use Modules\Media\Models\MediaMapper; use Modules\Media\Models\NullMedia; use Modules\Media\Models\PathSettings; use Modules\Profile\Models\ContactElement; @@ -145,11 +144,9 @@ final class ApiController extends Controller */ public function apiSettingsAccountImageSet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void { - $uploadedFiles = $request->files; - - if (empty($uploadedFiles)) { + if (empty($request->files)) { $response->header->status = RequestStatusCode::R_400; - $this->createInvalidUpdateResponse($request, $response, $uploadedFiles); + $this->createInvalidUpdateResponse($request, $response, $request->files); return; } @@ -165,28 +162,15 @@ final class ApiController extends Controller $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( names: $request->getDataList('names'), fileNames: $request->getDataList('filenames'), - files: $uploadedFiles, + files: $request->files, account: $request->header->account, basePath: __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $profile->account->id, virtualPath: '/Accounts/' . $profile->account->id . ' ' . $profile->account->login, - pathSettings: PathSettings::FILE_PATH + pathSettings: PathSettings::FILE_PATH, + type: $request->getDataInt('type') ); - if ($request->hasData('type')) { - foreach ($uploaded as $file) { - $this->createModelRelation( - $request->header->account, - $file->id, - $request->getDataInt('type'), - MediaMapper::class, - 'types', - '', - $request->getOrigin() - ); - } - } - - $profile->image = empty($uploaded) ? new NullMedia() : \reset($uploaded); + $profile->image = empty($uploaded->sources) ? new NullMedia() : \reset($uploaded->sources); if ($profile->image->id > 0) { $profile->image = $this->app->moduleManager->get('Media')->resizeImage($profile->image, 100, 100, false); } diff --git a/Theme/Backend/modules-create.tpl.php b/Theme/Backend/modules-create.tpl.php index 06289bc..f051d1e 100755 --- a/Theme/Backend/modules-create.tpl.php +++ b/Theme/Backend/modules-create.tpl.php @@ -25,7 +25,7 @@ echo $this->data['nav']->render();
| - |
| = $this->getData('accGrpSelector')->render('iAccount', true); ?> + |
| = $this->getData('accGrpSelector')->render('iAccount', ''); ?> |