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

Merge branch 'develop' of https://github.com/Karaka-Management/oms-Profile into develop

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 13:58:43 +00:00
commit a86eeb12cd
7 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Settings/Theme/Backend/settings.tpl.php
View File

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
echo $this->getData('nav')->render();
echo $this->data['nav']->render();
?>
Settings

6
Controller/ApiController.php
View File

@ -172,7 +172,7 @@ final class ApiController extends Controller
*/
public function apiSettingsAccountImageSet(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
$uploadedFiles = $request->getFiles();
$uploadedFiles = $request->files;
if (empty($uploadedFiles)) {
$this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Profile', 'Invalid profile image', $uploadedFiles);
@ -234,7 +234,7 @@ final class ApiController extends Controller
public function apiContactElementCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateContactElementCreate($request))) {
$response->set('contact_element_create', new FormValidation($val));
$response->data['contact_element_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;
@ -319,7 +319,7 @@ final class ApiController extends Controller
public function apiAddressCreate(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
if (!empty($val = $this->validateAddressCreate($request))) {
$response->set('address_create', new FormValidation($val));
$response->data['address_create'] = new FormValidation($val);
$response->header->status = RequestStatusCode::R_400;
return;

46
Controller/BackendController.php
View File

@ -50,7 +50,7 @@ final class BackendController extends Controller
public function setupProfileStyles(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, 'Modules/Profile/Theme/Backend/css/styles.css?v=1.0.0');
}
@ -72,29 +72,23 @@ final class BackendController extends Controller
$view->setTemplate('/Modules/Profile/Theme/Backend/profile-list');
if ($request->getData('ptype') === 'p') {
$view->setData('accounts',
ProfileMapper::getAll()
$view->data['accounts'] = ProfileMapper::getAll()
->with('account')
->with('image')
->where('id', $request->getDataInt('id') ?? 0, '<')
->limit(25)->execute()
);
->limit(25)->execute();
} elseif ($request->getData('ptype') === 'n') {
$view->setData('accounts',
ProfileMapper::getAll()
$view->data['accounts'] = ProfileMapper::getAll()
->with('account')
->with('image')
->where('id', $request->getDataInt('id') ?? 0, '>')
->limit(25)->execute()
);
->limit(25)->execute();
} else {
$view->setData('accounts',
ProfileMapper::getAll()
$view->data['accounts'] = ProfileMapper::getAll()
->with('account')
->with('image')
->where('id', 0, '>')
->limit(25)->execute()
);
->limit(25)->execute();
}
/** @var \Model\Setting $profileImage */
@ -105,7 +99,7 @@ final class BackendController extends Controller
->where('id', (int) $profileImage->content)
->execute();
$view->setData('defaultImage', $image);
$view->data['defaultImage'] = $image;
return $view;
}
@ -126,19 +120,19 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response);
/** @var \phpOMS\Model\Html\Head $head */
$head = $response->get('Content')->getData('head');
$head = $response->get('Content')->head;
$head->addAsset(AssetType::CSS, '/Modules/Calendar/Theme/Backend/css/styles.css?v=1.0.0');
$view->setTemplate('/Modules/Profile/Theme/Backend/profile-single');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000301001, $request, $response);
$mediaListView = new \Modules\Media\Theme\Backend\Components\Media\ListView($this->app->l11nManager, $request, $response);
$mediaListView->setTemplate('/Modules/Media/Theme/Backend/Components/Media/list');
$view->addData('medialist', $mediaListView);
$view->data['medialist'] = $mediaListView;
$calendarView = new \Modules\Calendar\Theme\Backend\Components\Calendar\BaseView($this->app->l11nManager, $request, $response);
$calendarView->setTemplate('/Modules/Calendar/Theme/Backend/Components/Calendar/mini');
$view->addData('calendar', $calendarView);
$view->data['calendar'] = $calendarView;
$mapperQuery = ProfileMapper::get()
->with('account')
@ -150,7 +144,7 @@ final class BackendController extends Controller
? $mapperQuery->where('account', (int) $request->getData('for'))->execute()
: $mapperQuery->where('id', (int) $request->getData('id'))->execute();
$view->setData('account', $profile);
$view->data['account'] = $profile;
$l11n = null;
if ($profile->account->id === $request->header->account) {
@ -158,10 +152,10 @@ final class BackendController extends Controller
$l11n = LocalizationMapper::get()->where('id', $profile->account->l11n->id)->execute();
}
$view->setData('l11n', $l11n ?? new NullLocalization());
$view->data['l11n'] = $l11n ?? new NullLocalization();
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector);
$view->data['accGrpSelector'] = $accGrpSelector;
/** @var \Modules\Media\Models\Media[] $media */
$media = MediaMapper::getAll()
@ -170,7 +164,7 @@ final class BackendController extends Controller
->limit(25)
->execute();
$view->setData('media', $media);
$view->data['media'] = $media;
/** @var \Model\Setting $profileImage */
$profileImage = $this->app->appSettings->get(names: SettingsEnum::DEFAULT_PROFILE_IMAGE, module: 'Profile');
@ -178,7 +172,7 @@ final class BackendController extends Controller
/** @var \Modules\Media\Models\Media $image */
$image = MediaMapper::get()->where('id', (int) $profileImage->content)->execute();
$view->setData('defaultImage', $image);
$view->data['defaultImage'] = $image;
return $view;
}
@ -198,7 +192,7 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/' . static::NAME . '/Admin/Settings/Theme/Backend/settings');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000300000, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000300000, $request, $response);
return $view;
}
@ -218,10 +212,10 @@ final class BackendController extends Controller
{
$view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/Profile/Theme/Backend/modules-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000300000, $request, $response));
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000300000, $request, $response);
$accGrpSelector = new \Modules\Profile\Theme\Backend\Components\AccountGroupSelector\BaseView($this->app->l11nManager, $request, $response);
$view->addData('accGrpSelector', $accGrpSelector);
$view->data['accGrpSelector'] = $accGrpSelector;
return $view;
}

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

@ -12,7 +12,7 @@
*/
declare(strict_types=1);
echo $this->getData('nav')->render();
echo $this->data['nav']->render();
?>
<div class="row">

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

@ -12,4 +12,4 @@
*/
declare(strict_types=1);
echo $this->getData('nav')->render();
echo $this->data['nav']->render();

2
Theme/Backend/profile-list.tpl.php
View File

@ -18,7 +18,7 @@ use phpOMS\Uri\UriFactory;
* @var \phpOMS\Views\View $this
* @var \Modules\Profile\Models\Profile[] $accounts
*/
$accounts = $this->getData('accounts') ?? [];
$accounts = $this->data['accounts'] ?? [];
$previous = empty($accounts) ? '{/base}profile/list' : '{/base}/profile/list?{?}&id=' . \reset($accounts)->id . '&ptype=p';
$next = empty($accounts) ? '{/base}profile/list' : '{/base}/profile/list?{?}&id=' . \end($accounts)->id . '&ptype=n';

10
Theme/Backend/profile-single.tpl.php
View File

@ -30,15 +30,15 @@ use phpOMS\Utils\Converter\WeightType;
/** @var \phpOMS\Views\View $this */
/** @var \Modules\Profile\Models\Profile $profile */
$profile = $this->getData('account');
$profile = $this->data['account'];
/** @var \Modules\Media\Models\Media[] $media */
$media = $this->getData('media') ?? [];
$media = $this->data['media'] ?? [];
$account = $profile->account;
$l11n = $this->getData('l11n');
$l11n = $this->data['l11n'];
echo $this->getData('nav')->render();
echo $this->data['nav']->render();
?>
<div class="tabview tab-2">
<div class="box wf-100 col-xs-12">
@ -215,7 +215,7 @@ echo $this->getData('nav')->render();
<tr><td colspan="2">
<select id="iLanguages" name="settings_language">
<?php foreach ($languages as $code => $language) : $code = \strtolower(\substr($code, 1)); ?>
<option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($code === $l11n->getLanguage() ? ' selected' : ''); ?>><?= $this->printHtml($language); ?>
<option value="<?= $this->printHtml($code); ?>"<?= $this->printHtml($code === $l11n->language ? ' selected' : ''); ?>><?= $this->printHtml($language); ?>
<?php endforeach; ?>
</select>
<tr><td colspan="2"><label for="iTemperature"><?= $this->getHtml('Temperature'); ?></label>