make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

This commit is contained in:
Dennis Eichhorn 2023-05-06 11:42:06 +00:00
parent 091b506e5d
commit c508cc2260
28 changed files with 59 additions and 59 deletions

View File

@ -151,7 +151,7 @@ final class Application
$account = $this->loadAccount($request);
if (!($account instanceof NullAccount)) {
if ($account->id > 0) {
$response->header->l11n = $account->l11n;
} elseif ($this->app->sessionManager->get('language') !== null
&& $response->header->l11n->getLanguage() !== $this->app->sessionManager->get('language')
@ -161,6 +161,8 @@ final class Application
$this->app->sessionManager->get('language'),
$this->app->sessionManager->get('country') ?? '*'
);
} else {
$this->app->setResponseLanguage($request, $response, $this->config);
}
if (!\in_array($response->getLanguage(), $this->config['language'])) {

View File

@ -118,7 +118,7 @@ echo $this->getData('nav')->render(); ?>
?>
<tr tabindex="0">
<td><i class="fa fa-cogs"></i>
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $application->getId(); ?>
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $application->id; ?>
<td data-label="<?= $this->getHtml('Name'); ?>"><?= $this->printHtml($application->name); ?>
<?php endforeach; ?>
<?php if ($count === 0) : ?>
@ -197,7 +197,7 @@ echo $this->getData('nav')->render(); ?>
?>
<tr tabindex="0">
<td><i class="fa fa-cogs"></i>
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $setting->getId(); ?>
<td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><?= $setting->id; ?>
<td data-label="<?= $this->getHtml('Name'); ?>"><?= $this->printHtml($setting->name); ?>
<td data-label="<?= $this->getHtml('Value'); ?>"><?= $this->printHtml($setting->content); ?>
<td data-label="<?= $this->getHtml('Group'); ?>"><?= $this->printHtml($setting->group); ?>

View File

@ -265,7 +265,7 @@ final class ApiController extends Controller
$ticketElement = new TicketElement($taskElement);
$ticketElement->time = $request->getDataInt('time') ?? 0;
$ticketElement->ticket = $ticket->getId();
$ticketElement->ticket = $ticket->id;
return $ticketElement;
}
@ -642,7 +642,7 @@ final class ApiController extends Controller
$this->createModelRelation(
$request->header->account,
(int) $request->getData('type'),
$attrValue->getId(),
$attrValue->id,
TicketAttributeTypeMapper::class, 'defaults', '', $request->getOrigin()
);
}

View File

@ -252,9 +252,7 @@ final class BackendController extends Controller
$id = $request->getDataString('id') ?? '';
$settings = SettingMapper::getAll()->where('module', $id)->execute();
if (!($settings instanceof NullSetting)) {
$view->setData('settings', !\is_array($settings) ? [$settings] : $settings);
}
$view->setData('settings', $settings);
/** @var \Modules\Support\Models\SupportApp[] $applications */
$applications = SupportAppMapper::getAll()->execute();

View File

@ -30,7 +30,7 @@ class SupportApp implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Application name.

View File

@ -34,7 +34,7 @@ class Ticket
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* The ticket is using a task.

View File

@ -30,7 +30,7 @@ class TicketAttribute implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Ticket this attribute belongs to

View File

@ -33,7 +33,7 @@ class TicketAttributeType implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Name/string identifier by which it can be found/categorized

View File

@ -36,7 +36,7 @@ class TicketAttributeValue implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Depending attribute type

View File

@ -32,7 +32,7 @@ class TicketElement implements \JsonSerializable
* @var int
* @since 1.0.0
*/
protected int $id = 0;
public int $id = 0;
/**
* Ticket element time

View File

@ -40,7 +40,7 @@ echo $this->getData('nav')->render(); ?>
<?php
$c = 0;
foreach ($tickets as $key => $ticket) : ++$c;
$url = UriFactory::build('{/base}/support/ticket?{?}&id=' . $ticket->getId());
$url = UriFactory::build('{/base}/support/ticket?{?}&id=' . $ticket->id);
?>
<tr data-href="<?= $url; ?>">
<td><a href="<?= $url; ?>">
@ -49,9 +49,9 @@ echo $this->getData('nav')->render(); ?>
</span></a>
<td><a href="<?= $url; ?>"><?= $this->getHtml('P' . $ticket->task->getPriority(), 'Tasks'); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->title); ?></a>
<td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?for=' . $ticket->task->createdBy->getId()); ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
<td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?for=' . $ticket->task->createdBy->id); ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
<td><a class="content" href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdBy->name1); ?> <?= $this->printHtml($ticket->task->createdBy->name2); ?></a>
<td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?for=' . $ticket->for->getId()); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
<td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?for=' . $ticket->for->id); ?>"><?= $this->printHtml($ticket->for->name1); ?> <?= $this->printHtml($ticket->for->name2); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($ticket->task->createdAt->format('Y-m-d H:i')); ?></a>
<?php endforeach; if ($c == 0) : ?>
<tr><td colspan="7" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>

View File

@ -61,7 +61,7 @@ echo $this->getData('nav')->render(); ?>
<div class="portlet-head">
<div class="row middle-xs">
<span class="col-xs-0">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($task->createdBy->getId()); ?>">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($task->createdBy->id); ?>">
</span>
<span>
<?= $this->printHtml($task->createdBy->name1); ?> - <?= $this->printHtml($task->createdAt->format('Y/m/d H:i')); ?>
@ -88,7 +88,7 @@ echo $this->getData('nav')->render(); ?>
<?php if (!empty($taskMedia)) : ?>
<div>
<?php foreach ($taskMedia as $media) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->id);?>"><?= $media->name; ?></a></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
@ -106,7 +106,7 @@ echo $this->getData('nav')->render(); ?>
</div>
</div>
<div class="col-xs-0 end-xs plain-grid">
<?php if ($task->isEditable && $this->request->header->account === $task->createdBy->getId()) : ?>
<?php if ($task->isEditable && $this->request->header->account === $task->createdBy->id) : ?>
<div class="col-xs end-xs plain-grid">
<button class="save hidden"><?= $this->getHtml('Save', '0', '0'); ?></button>
<button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0'); ?></button>
@ -180,7 +180,7 @@ echo $this->getData('nav')->render(); ?>
<section class="portlet">
<div class="portlet-body">
<?= \sprintf($this->getHtml('status_change', 'Tasks', 'Backend'),
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->taskElement->createdBy->getId()) . '">' . $this->printHtml($element->taskElement->createdBy->name1) . '</a>',
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->taskElement->createdBy->id) . '">' . $this->printHtml($element->taskElement->createdBy->name1) . '</a>',
$element->taskElement->createdAt->format('Y-m-d H:i')
); ?>
<span class="tag task-status-<?= $element->taskElement->getStatus(); ?>">
@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); ?>
<section class="portlet">
<div class="portlet-body">
<?= \sprintf($this->getHtml('priority_change', 'Tasks', 'Backend'),
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->taskElement->createdBy->getId()) . '">' . $this->printHtml($element->taskElement->createdBy->name1) . '</a>',
'<a href="' . UriFactory::build('profile/single?{?}&for=' . $element->taskElement->createdBy->id) . '">' . $this->printHtml($element->taskElement->createdBy->name1) . '</a>',
$element->taskElement->createdAt->format('Y-m-d H:i')
); ?>
<span class="tag task-priority-<?= $element->taskElement->getPriority(); ?>">
@ -207,18 +207,18 @@ echo $this->getData('nav')->render(); ?>
<?php endif; ?>
<?php if ($element->taskElement->description !== '') : ?>
<section id="taskelmenet-<?= $element->taskElement->getId(); ?>" class="portlet taskElement"
<section id="taskelmenet-<?= $element->taskElement->id; ?>" class="portlet taskElement"
data-update-content="#elements"
data-update-element=".taskElement .taskElement-content"
data-update-tpl="#taskElementContentTpl"
data-tag="form"
data-method="POST"
data-id="<?= $element->taskElement->getId(); ?>"
data-uri="<?= UriFactory::build('{/api}task/element?id=' . $element->taskElement->getId() .'&csrf={$CSRF}'); ?>">
data-id="<?= $element->taskElement->id; ?>"
data-uri="<?= UriFactory::build('{/api}task/element?id=' . $element->taskElement->id .'&csrf={$CSRF}'); ?>">
<div class="portlet-head">
<div class="row middle-xs">
<span class="col-xs-0">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->taskElement->createdBy->getId()); ?>">
<img class="profile-image" loading="lazy" alt="<?= $this->getHtml('User', '0', '0'); ?>" src="<?= $this->getAccountImage($element->taskElement->createdBy->id); ?>">
</span>
<span class="col-xs">
<?= $this->printHtml($element->taskElement->createdBy->name1); ?> - <?= $this->printHtml($element->taskElement->createdAt->format('Y-m-d H:i')); ?>
@ -239,13 +239,13 @@ echo $this->getData('nav')->render(); ?>
<?php $elementMedia = $element->taskElement->getMedia();
if (!empty($elementMedia)
|| ($task->isEditable
&& $this->request->header->account === $element->taskElement->createdBy->getId())
&& $this->request->header->account === $element->taskElement->createdBy->id)
) : ?>
<div class="portlet-foot row middle-xs">
<?php if (!empty($elementMedia)) : ?>
<div>
<?php foreach ($elementMedia as $media) : ?>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->getId());?>"><?= $media->name; ?></a></span>
<span><a class="content" href="<?= UriFactory::build('{/base}/media/single?id=' . $media->id);?>"><?= $media->name; ?></a></span>
<?php endforeach; ?>
</div>
<?php endif; ?>
@ -270,10 +270,10 @@ echo $this->getData('nav')->render(); ?>
<?php endif; ?>
<?php if ($task->isEditable
&& $this->request->header->account === $element->taskElement->createdBy->getId()
&& $this->request->header->account === $element->taskElement->createdBy->id
) : ?>
<div class="col-xs end-xs plain-grid">
<input type="hidden" value="<?= $element->taskElement->getId(); ?>" name="id">
<input type="hidden" value="<?= $element->taskElement->id; ?>" name="id">
<button class="save hidden"><?= $this->getHtml('Save', '0', '0'); ?></button>
<button class="cancel hidden"><?= $this->getHtml('Cancel', '0', '0'); ?></button>
<button class="update"><?= $this->getHtml('Edit', '0', '0'); ?></button>
@ -287,14 +287,14 @@ echo $this->getData('nav')->render(); ?>
<?php
$tos = $element->taskElement->getTo();
if (\count($tos) > 1
|| (!empty($tos) && $tos[0]->getRelation()->getId() !== $element->taskElement->createdBy->getId())
|| (!empty($tos) && $tos[0]->getRelation()->id !== $element->taskElement->createdBy->id)
) : ?>
<section class="portlet wf-100">
<div class="portlet-body">
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $element->taskElement->createdBy->getId()); ?>"><?= $this->printHtml($element->taskElement->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $element->taskElement->createdBy->id); ?>"><?= $this->printHtml($element->taskElement->createdBy->name1); ?></a> <?= $this->getHtml('forwarded_to'); ?>
<?php foreach ($tos as $to) : ?>
<?php if ($to instanceof AccountRelation) : ?>
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $to->getRelation()->getId()); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
<a href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $to->getRelation()->id); ?>"><?= $this->printHtml($to->getRelation()->name1); ?></a>
<?php elseif ($to instanceof GroupRelation) : ?>
<?= $this->printHtml($to->getRelation()->name); ?>
<?php endif; ?>

View File

@ -70,7 +70,7 @@ class TicketView extends View
/** @var \Modules\Profile\Models\Profile $profile */
$profile = ProfileMapper::get()->with('image')->where('account', $account)->execute();
if (($profile instanceof NullProfile) || $profile->image->getPath() === '') {
if ($profile->id === 0 || $profile->image->getPath() === '') {
return UriFactory::build('{/base}/' . $this->defaultProfileImage->getPath());
}

View File

@ -38,7 +38,7 @@ trait ApiControllerAttributeTrait
$request->setData('language', ISO639x1Enum::_EN);
$this->module->apiTicketAttributeTypeCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -56,7 +56,7 @@ trait ApiControllerAttributeTrait
$request->setData('language', ISO639x1Enum::_DE);
$this->module->apiTicketAttributeTypeL11nCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -76,7 +76,7 @@ trait ApiControllerAttributeTrait
$request->setData('country', ISO3166TwoEnum::_DEU);
$this->module->apiTicketAttributeValueCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -95,7 +95,7 @@ trait ApiControllerAttributeTrait
$request->setData('country', ISO3166TwoEnum::_DEU);
$this->module->apiTicketAttributeValueCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -114,7 +114,7 @@ trait ApiControllerAttributeTrait
$request->setData('country', ISO3166TwoEnum::_DEU);
$this->module->apiTicketAttributeValueCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -133,7 +133,7 @@ trait ApiControllerAttributeTrait
$request->setData('country', ISO3166TwoEnum::_DEU);
$this->module->apiTicketAttributeValueCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -151,7 +151,7 @@ trait ApiControllerAttributeTrait
$request->setData('type', '1');
$this->module->apiTicketAttributeCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**

View File

@ -35,7 +35,7 @@ trait ApiControllerTicketTrait
$request->setData('name', 'TestSupportApp');
$this->module->apiSupportAppCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -70,7 +70,7 @@ trait ApiControllerTicketTrait
$request->setData('for', '1');
$this->module->apiTicketCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -86,7 +86,7 @@ trait ApiControllerTicketTrait
$request->setData('id', '1');
$this->module->apiTicketGet($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -121,7 +121,7 @@ trait ApiControllerTicketTrait
$request->setData('due', (new \DateTime('now'))->format('Y-m-d H:i:s'));
$this->module->apiTicketElementCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**
@ -137,7 +137,7 @@ trait ApiControllerTicketTrait
$request->setData('id', '1');
$this->module->apiTicketElementGet($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId());
self::assertGreaterThan(0, $response->get('')['response']->id);
}
/**

View File

@ -37,6 +37,6 @@ final class NullSupportAppTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullSupportApp(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullTicketAttributeTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTicketAttribute(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullTicketAttributeTypeTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTicketAttributeType(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullTicketAttributeValueTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTicketAttributeValue(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullTicketElementTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTicketElement(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,6 +37,6 @@ final class NullTicketTest extends \PHPUnit\Framework\TestCase
public function testId() : void
{
$null = new NullTicket(2);
self::assertEquals(2, $null->getId());
self::assertEquals(2, $null->id);
}
}

View File

@ -37,7 +37,7 @@ final class SupportAppTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->app->getId());
self::assertEquals(0, $this->app->id);
self::assertEquals('', $this->app->name);
}

View File

@ -37,7 +37,7 @@ final class TicketAttributeTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->attribute->getId());
self::assertEquals(0, $this->attribute->id);
self::assertInstanceOf('\Modules\Support\Models\TicketAttributeType', $this->attribute->type);
self::assertInstanceOf('\Modules\Support\Models\TicketAttributeValue', $this->attribute->value);
}

View File

@ -37,7 +37,7 @@ final class TicketAttributeTypeTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->type->getId());
self::assertEquals(0, $this->type->id);
self::assertEquals('', $this->type->getL11n());
}

View File

@ -38,7 +38,7 @@ final class TicketAttributeValueTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->value->getId());
self::assertEquals(0, $this->value->id);
self::assertNull($this->value->getValue());
self::assertFalse($this->value->isDefault);
}

View File

@ -37,7 +37,7 @@ final class TicketElementTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->element->getId());
self::assertEquals(0, $this->element->id);
self::assertEquals(0, $this->element->time);
self::assertEquals(0, $this->element->ticket);
}

View File

@ -39,7 +39,7 @@ final class TicketTest extends \PHPUnit\Framework\TestCase
*/
public function testDefault() : void
{
self::assertEquals(0, $this->ticket->getId());
self::assertEquals(0, $this->ticket->id);
self::assertNull($this->ticket->for);
self::assertEquals([], $this->ticket->getTicketElements());
self::assertEquals([], $this->ticket->getAttributes());

View File

@ -40,6 +40,6 @@ class TicketViewTest extends \PHPUnit\Framework\TestCase
{
$view = new TicketView();
self::assertEquals('Web/Backend/img/default-user.jpg', $view->getAccountImage(1));
self::assertEquals('/Web/Backend/img/default-user.jpg', $view->getAccountImage(1));
}
}