Jingga/oms-Profile
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Profile.git synced 2026-01-11 15:28:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-12 00:52:07 +00:00
parent cd48310cfb
commit 19d9fe5089
4 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Admin/Install/Navigation.install.json
View File

@ -5,7 +5,7 @@
"type": 2, "type": 2,
"subtype": 1, "subtype": 1,
"name": "Profiles", "name": "Profiles",
"uri": "{/base}/profile/list?{?}", "uri": "{/base}/profile/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 10, "order": 10,
@ -19,7 +19,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "List", "name": "List",
"uri": "{/base}/profile/list?{?}", "uri": "{/base}/profile/list",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -34,7 +34,7 @@
"type": 5, "type": 5,
"subtype": 1, "subtype": 1,
"name": "Profile", "name": "Profile",
"uri": "{/base}/profile/view/front?{?}", "uri": "{/base}/profile/view/front",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 3, "order": 3,
@ -49,7 +49,7 @@
"type": 5, "type": 5,
"subtype": 1, "subtype": 1,
"name": "Settings", "name": "Settings",
"uri": "{/base}/profile/view/settings?{?}", "uri": "{/base}/profile/view/settings",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 999, "order": 999,
@ -66,7 +66,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Overview", "name": "Overview",
"uri": "{/base}/admin/module/settings?{?}", "uri": "{/base}/admin/module/settings",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -81,7 +81,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Settings", "name": "Settings",
"uri": "{/base}/admin/module/settings/view/settings?{?}", "uri": "{/base}/admin/module/settings/view/settings",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 1, "order": 1,
@ -96,7 +96,7 @@
"type": 3, "type": 3,
"subtype": 1, "subtype": 1,
"name": "Create", "name": "Create",
"uri": "{/base}/admin/module/settings/view/create?{?}", "uri": "{/base}/admin/module/settings/view/create",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 2, "order": 2,

1
Admin/Install/SearchCommands.php
View File

@ -22,6 +22,7 @@ return [
[ [
'dest' => '\Modules\Profile\Controller\SearchController:searchGeneral', 'dest' => '\Modules\Profile\Controller\SearchController:searchGeneral',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'active' => true,
'permission' => [ 'permission' => [
'module' => SearchController::NAME, 'module' => SearchController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

28
Controller/ApiController.php
View File

@ -16,7 +16,6 @@ namespace Modules\Profile\Controller;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\ContactType; use Modules\Admin\Models\ContactType;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Profile\Models\ContactElement; use Modules\Profile\Models\ContactElement;
@ -145,11 +144,9 @@ final class ApiController extends Controller
*/ */
public function apiSettingsAccountImageSet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void public function apiSettingsAccountImageSet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{ {
$uploadedFiles = $request->files; if (empty($request->files)) {
if (empty($uploadedFiles)) {
$response->header->status = RequestStatusCode::R_400; $response->header->status = RequestStatusCode::R_400;
$this->createInvalidUpdateResponse($request, $response, $uploadedFiles); $this->createInvalidUpdateResponse($request, $response, $request->files);
return; return;
} }
@ -165,28 +162,15 @@ final class ApiController extends Controller
$uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles( $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
names: $request->getDataList('names'), names: $request->getDataList('names'),
fileNames: $request->getDataList('filenames'), fileNames: $request->getDataList('filenames'),
files: $uploadedFiles, files: $request->files,
account: $request->header->account, account: $request->header->account,
basePath: __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $profile->account->id, basePath: __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $profile->account->id,
virtualPath: '/Accounts/' . $profile->account->id . ' ' . $profile->account->login, virtualPath: '/Accounts/' . $profile->account->id . ' ' . $profile->account->login,
pathSettings: PathSettings::FILE_PATH pathSettings: PathSettings::FILE_PATH,
type: $request->getDataInt('type')
); );
if ($request->hasData('type')) { $profile->image = empty($uploaded->sources) ? new NullMedia() : \reset($uploaded->sources);
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);
if ($profile->image->id > 0) { if ($profile->image->id > 0) {
$profile->image = $this->app->moduleManager->get('Media')->resizeImage($profile->image, 100, 100, false); $profile->image = $this->app->moduleManager->get('Media')->resizeImage($profile->image, 100, 100, false);
} }

2
Theme/Backend/modules-create.tpl.php
View File

@ -25,7 +25,7 @@ echo $this->data['nav']->render();
<table class="layout wf-100" style="table-layout: fixed"> <table class="layout wf-100" style="table-layout: fixed">
<tbody> <tbody>
<tr><td><label for="iAccount"><?= $this->getHtml('Account'); ?></label> <tr><td><label for="iAccount"><?= $this->getHtml('Account'); ?></label>
<tr><td><?= $this->getData('accGrpSelector')->render('iAccount', true); ?> <tr><td><?= $this->getData('accGrpSelector')->render('iAccount', ''); ?>
<tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-module"> <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>" name="create-module">
</table> </table>
</form> </form>