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

crash backup
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2025-03-21 02:48:19 +00:00
parent e9a8599146
commit 037a8982c2
12 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Controller/ApiAddressAttributeController.php
View File

@ -243,7 +243,7 @@ final class ApiAddressAttributeController extends Controller
->with('type')
->with('type/defaults')
->with('value')
->where('id', (int) $request->getData('id'))
->where('id', $request->getDataInt('id') ?? 0)
->execute();
$new = $this->updateAttributeFromRequest($request, clone $old);
@ -291,7 +291,7 @@ final class ApiAddressAttributeController extends Controller
$addressAttribute = AddressAttributeMapper::get()
->with('type')
->where('id', (int) $request->getData('id'))
->where('id', $request->getDataInt('id') ?? 0)
->execute();
if ($addressAttribute->type->isRequired) {
@ -327,7 +327,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var BaseStringL11n $old */
$old = AddressAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = AddressAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAttributeTypeL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, AddressAttributeTypeL11nMapper::class, 'address_attribute_type_l11n', $request->getOrigin());
@ -357,7 +357,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var BaseStringL11n $addressAttributeTypeL11n */
$addressAttributeTypeL11n = AddressAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$addressAttributeTypeL11n = AddressAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $addressAttributeTypeL11n, AddressAttributeTypeL11nMapper::class, 'address_attribute_type_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $addressAttributeTypeL11n);
}
@ -385,7 +385,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var AttributeType $old */
$old = AddressAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute();
$old = AddressAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAttributeTypeFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, AddressAttributeTypeMapper::class, 'address_attribute_type', $request->getOrigin());
@ -417,7 +417,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var AttributeType $addressAttributeType */
$addressAttributeType = AddressAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute();
$addressAttributeType = AddressAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $addressAttributeType, AddressAttributeTypeMapper::class, 'address_attribute_type', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $addressAttributeType);
}
@ -445,7 +445,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var AttributeValue $old */
$old = AddressAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = AddressAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
/** @var \Modules\Attribute\Models\Attribute $attr */
$attr = AddressAttributeMapper::get()
@ -485,7 +485,7 @@ final class ApiAddressAttributeController extends Controller
// }
// /** @var \Modules\Organization\Models\AddressAttributeValue $addressAttributeValue */
// $addressAttributeValue = AddressAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute();
// $addressAttributeValue = AddressAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
// $this->deleteModel($request->header->account, $addressAttributeValue, AddressAttributeValueMapper::class, 'address_attribute_value', $request->getOrigin());
// $this->createStandardDeleteResponse($request, $response, $addressAttributeValue);
}
@ -513,7 +513,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var BaseStringL11n $old */
$old = AddressAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'));
$old = AddressAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0);
$new = $this->updateAttributeValueL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, AddressAttributeValueL11nMapper::class, 'address_attribute_value_l11n', $request->getOrigin());
@ -543,7 +543,7 @@ final class ApiAddressAttributeController extends Controller
}
/** @var BaseStringL11n $addressAttributeValueL11n */
$addressAttributeValueL11n = AddressAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$addressAttributeValueL11n = AddressAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $addressAttributeValueL11n, AddressAttributeValueL11nMapper::class, 'address_attribute_value_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $addressAttributeValueL11n);
}

20
Controller/ApiAttributeController.php
View File

@ -253,7 +253,7 @@ final class ApiAttributeController extends Controller
->with('type')
->with('type/defaults')
->with('value')
->where('id', (int) $request->getData('id'))
->where('id', $request->getDataInt('id') ?? 0)
->execute();
$new = $this->updateAttributeFromRequest($request, clone $old);
@ -301,7 +301,7 @@ final class ApiAttributeController extends Controller
$unitAttribute = UnitAttributeMapper::get()
->with('type')
->where('id', (int) $request->getData('id'))
->where('id', $request->getDataInt('id') ?? 0)
->execute();
if ($unitAttribute->type->isRequired) {
@ -337,7 +337,7 @@ final class ApiAttributeController extends Controller
}
/** @var BaseStringL11n $old */
$old = UnitAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = UnitAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAttributeTypeL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, UnitAttributeTypeL11nMapper::class, 'unit_attribute_type_l11n', $request->getOrigin());
@ -367,7 +367,7 @@ final class ApiAttributeController extends Controller
}
/** @var BaseStringL11n $unitAttributeTypeL11n */
$unitAttributeTypeL11n = UnitAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$unitAttributeTypeL11n = UnitAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $unitAttributeTypeL11n, UnitAttributeTypeL11nMapper::class, 'unit_attribute_type_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $unitAttributeTypeL11n);
}
@ -395,7 +395,7 @@ final class ApiAttributeController extends Controller
}
/** @var AttributeType $old */
$old = UnitAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute();
$old = UnitAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAttributeTypeFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, UnitAttributeTypeMapper::class, 'unit_attribute_type', $request->getOrigin());
@ -427,7 +427,7 @@ final class ApiAttributeController extends Controller
}
/** @var AttributeType $unitAttributeType */
$unitAttributeType = UnitAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute();
$unitAttributeType = UnitAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $unitAttributeType, UnitAttributeTypeMapper::class, 'unit_attribute_type', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $unitAttributeType);
}
@ -455,7 +455,7 @@ final class ApiAttributeController extends Controller
}
/** @var AttributeValue $old */
$old = UnitAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = UnitAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
/** @var \Modules\Attribute\Models\Attribute $attr */
$attr = UnitAttributeMapper::get()
@ -495,7 +495,7 @@ final class ApiAttributeController extends Controller
// }
// /** @var \Modules\Organization\Models\UnitAttributeValue $unitAttributeValue */
// $unitAttributeValue = UnitAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute();
// $unitAttributeValue = UnitAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
// $this->deleteModel($request->header->account, $unitAttributeValue, UnitAttributeValueMapper::class, 'unit_attribute_value', $request->getOrigin());
// $this->createStandardDeleteResponse($request, $response, $unitAttributeValue);
}
@ -523,7 +523,7 @@ final class ApiAttributeController extends Controller
}
/** @var BaseStringL11n $old */
$old = UnitAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'));
$old = UnitAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0);
$new = $this->updateAttributeValueL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, UnitAttributeValueL11nMapper::class, 'unit_attribute_value_l11n', $request->getOrigin());
@ -553,7 +553,7 @@ final class ApiAttributeController extends Controller
}
/** @var BaseStringL11n $unitAttributeValueL11n */
$unitAttributeValueL11n = UnitAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute();
$unitAttributeValueL11n = UnitAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $unitAttributeValueL11n, UnitAttributeValueL11nMapper::class, 'unit_attribute_value_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $unitAttributeValueL11n);
}

18
Controller/ApiController.php
View File

@ -95,7 +95,7 @@ final class ApiController extends Controller
public function apiUnitGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Unit $unit */
$unit = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
$unit = UnitMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->createStandardReturnResponse($request, $response, $unit);
}
@ -115,7 +115,7 @@ final class ApiController extends Controller
public function apiUnitSet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Unit $old */
$old = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = UnitMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateUnitFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, UnitMapper::class, 'unit', $request->getOrigin());
$this->createStandardUpdateResponse($request, $response, $new);
@ -159,7 +159,7 @@ final class ApiController extends Controller
public function apiUnitDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Unit $unit */
$unit = UnitMapper::get()->where('id', (int) $request->getData('id'))->execute();
$unit = UnitMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $unit, UnitMapper::class, 'unit', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $unit);
}
@ -472,7 +472,7 @@ final class ApiController extends Controller
public function apiPositionGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Position $position */
$position = PositionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$position = PositionMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->createStandardReturnResponse($request, $response, $position);
}
@ -492,7 +492,7 @@ final class ApiController extends Controller
public function apiPositionDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Position $position */
$position = PositionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$position = PositionMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $position, PositionMapper::class, 'position', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $position);
}
@ -513,7 +513,7 @@ final class ApiController extends Controller
public function apiPositionSet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Position $old */
$old = PositionMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = PositionMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updatePositionFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, PositionMapper::class, 'position', $request->getOrigin());
$this->createStandardUpdateResponse($request, $response, $new);
@ -647,7 +647,7 @@ final class ApiController extends Controller
public function apiDepartmentGet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Department $department */
$department = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
$department = DepartmentMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->createStandardReturnResponse($request, $response, $department);
}
@ -667,7 +667,7 @@ final class ApiController extends Controller
public function apiDepartmentSet(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Department $old */
$old = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
$old = DepartmentMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateDepartmentFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, DepartmentMapper::class, 'department', $request->getOrigin());
$this->createStandardUpdateResponse($request, $response, $new);
@ -714,7 +714,7 @@ final class ApiController extends Controller
public function apiDepartmentDelete(RequestAbstract $request, ResponseAbstract $response, array $data = []) : void
{
/** @var Department $department */
$department = DepartmentMapper::get()->where('id', (int) $request->getData('id'))->execute();
$department = DepartmentMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $department, DepartmentMapper::class, 'department', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $department);
}

6
Controller/BackendController.php
View File

@ -97,7 +97,7 @@ final class BackendController extends Controller
->with('address')
->with('contacts')
->with('image')
->where('id', (int) $request->getData('id'))
->where('id', $request->getDataInt('id') ?? 0)
->execute();
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
@ -289,7 +289,7 @@ final class BackendController extends Controller
$unitSelectorView = new \Modules\Organization\Theme\Backend\Components\UnitTagSelector\UnitTagSelectorView($this->app->l11nManager, $request, $response);
$view->data['unit-selector'] = $unitSelectorView;
$view->data['department'] = DepartmentMapper::get()->with('parent')->with('unit')->where('id', (int) $request->getData('id'))->execute();
$view->data['department'] = DepartmentMapper::get()->with('parent')->with('unit')->where('id', $request->getDataInt('id') ?? 0)->execute();
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->data['editor'] = $editor;
@ -387,7 +387,7 @@ final class BackendController extends Controller
$departmentSelectorView = new \Modules\Organization\Theme\Backend\Components\DepartmentTagSelector\DepartmentTagSelectorView($this->app->l11nManager, $request, $response);
$view->data['department-selector'] = $departmentSelectorView;
$view->data['position'] = PositionMapper::get()->with('parent')->with('department')->where('id', (int) $request->getData('id'))->execute();
$view->data['position'] = PositionMapper::get()->with('parent')->with('department')->where('id', $request->getDataInt('id') ?? 0)->execute();
$editor = new \Modules\Editor\Theme\Backend\Components\Editor\BaseView($this->app->l11nManager, $request, $response);
$view->data['editor'] = $editor;

2
Theme/Backend/Components/DepartmentTagSelector/DepartmentTagSelectorView.php
View File

@ -88,7 +88,7 @@ class DepartmentTagSelectorView extends View
$this->name = $data[1];
$this->isRequired = $data[2] ?? false;
$this->getData('department-selector-popup')->id = $this->id;
$this->data['department-selector-popup']->id = $this->id;
return parent::render();
}

2
Theme/Backend/Components/PositionTagSelector/PositionTagSelectorView.php
View File

@ -88,7 +88,7 @@ class PositionTagSelectorView extends View
$this->name = $data[1];
$this->isRequired = $data[2] ?? false;
$this->getData('position-selector-popup')->id = $this->id;
$this->data['position-selector-popup']->id = $this->id;
return parent::render();
}

2
Theme/Backend/Components/UnitTagSelector/UnitTagSelectorView.php
View File

@ -87,7 +87,7 @@ class UnitTagSelectorView extends View
$this->id = $data[0];
$this->name = $data[1];
$this->isRequired = $data[2] ?? false;
$this->getData('unit-selector-popup')->id = $this->id;
$this->data['unit-selector-popup']->id = $this->id;
return parent::render();
}

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

@ -26,7 +26,7 @@ $previous = empty($departments)
$next = empty($departments)
? 'organization/department/list'
: 'organization/department/list?{?}&id='
. ($this->getData('hasMore') ? \end($departments)->id : $this->request->getData('id'))
. ($this->data['hasMore'] ? \end($departments)->id : $this->request->getData('id'))
. '&ptype=n';
echo $this->data['nav']->render(); ?>

6
Theme/Backend/department-view.tpl.php
View File

@ -83,10 +83,10 @@ echo $this->data['nav']->render(); ?>
</div>
<div class="form-group">
<?= $this->getData('editor')->render('department-editor'); ?>
<?= $this->data['editor']->render('department-editor'); ?>
</div>
<?= $this->getData('editor')->getData('text')->render(
<?= $this->data['editor']->data['text']->render(
'department-editor',
'description',
'iDepartment',
@ -107,4 +107,4 @@ echo $this->data['nav']->render(); ?>
</div>
</div>
<?= $this->getData('department-selector')->getData('department-selector-popup')->render(); ?>
<?= $this->data['department-selector']->data['department-selector-popup']->render(); ?>

6
Theme/Backend/position-view.tpl.php
View File

@ -84,10 +84,10 @@ echo $this->data['nav']->render(); ?>
</div>
<div class="form-group">
<?= $this->getData('editor')->render('position-editor'); ?>
<?= $this->data['editor']->render('position-editor'); ?>
</div>
<?= $this->getData('editor')->getData('text')->render(
<?= $this->data['editor']->data['text']->render(
'position-editor',
'description',
'iPosition',
@ -107,4 +107,4 @@ echo $this->data['nav']->render(); ?>
</div>
</div>
<?= $this->getData('position-selector')->getData('position-selector-popup')->render(); ?>
<?= $this->data['position-selector']->data['position-selector-popup']->render(); ?>

6
Theme/Backend/unit-create.tpl.php
View File

@ -64,10 +64,10 @@ echo $this->data['nav']->render(); ?>
</div>
<div class="form-group">
<?= $this->getData('editor')->render('unit-editor'); ?>
<?= $this->data['editor']->render('unit-editor'); ?>
</div>
<?= $this->getData('editor')->getData('text')->render('unit-editor', 'description', 'fUnitCreate'); ?>
<?= $this->data['editor']->data['text']->render('unit-editor', 'description', 'fUnitCreate'); ?>
</div>
<div class="portlet-foot">
<input id="iUnitCreate" name="submit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
@ -119,4 +119,4 @@ echo $this->data['nav']->render(); ?>
</div>
</form>
<?= $this->getData('unit-selector')->getData('unit-selector-popup')->render(); ?>
<?= $this->data['unit-selector']->data['unit-selector-popup']->render(); ?>

6
Theme/Backend/unit-view.tpl.php
View File

@ -95,10 +95,10 @@ echo $this->data['nav']->render(); ?>
</div>
<div class="form-group">
<?= $this->getData('editor')->render('unit-editor'); ?>
<?= $this->data['editor']->render('unit-editor'); ?>
</div>
<?= $this->getData('editor')->getData('text')->render(
<?= $this->data['editor']->data['text']->render(
'unit-editor',
'description',
'iUnit',
@ -164,7 +164,7 @@ echo $this->data['nav']->render(); ?>
</section>
</div>
</div>
<?= $this->getData('unit-selector')->getData('unit-selector-popup')->render(); ?>
<?= $this->data['unit-selector']->data['unit-selector-popup']->render(); ?>
</div>
<?php if (!$isNew) : ?>