Jingga/oms-ContractManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ContractManagement.git synced 2026-01-11 17:48: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:18 +00:00
parent b6dbecac42
commit 6cca68544f
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Controller/ApiAttributeController.php
View File

@ -224,7 +224,7 @@ final class ApiAttributeController extends Controller
->with('type') ->with('type')
->with('type/defaults') ->with('type/defaults')
->with('value') ->with('value')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->execute(); ->execute();
$new = $this->updateAttributeFromRequest($request, clone $old); $new = $this->updateAttributeFromRequest($request, clone $old);
@ -272,7 +272,7 @@ final class ApiAttributeController extends Controller
$contractAttribute = ContractAttributeMapper::get() $contractAttribute = ContractAttributeMapper::get()
->with('type') ->with('type')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->execute(); ->execute();
if ($contractAttribute->type->isRequired) { if ($contractAttribute->type->isRequired) {
@ -308,7 +308,7 @@ final class ApiAttributeController extends Controller
} }
/** @var BaseStringL11n $old */ /** @var BaseStringL11n $old */
$old = ContractAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = ContractAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAttributeTypeL11nFromRequest($request, clone $old); $new = $this->updateAttributeTypeL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ContractAttributeTypeL11nMapper::class, 'contract_attribute_type_l11n', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ContractAttributeTypeL11nMapper::class, 'contract_attribute_type_l11n', $request->getOrigin());
@ -338,7 +338,7 @@ final class ApiAttributeController extends Controller
} }
/** @var BaseStringL11n $contractAttributeTypeL11n */ /** @var BaseStringL11n $contractAttributeTypeL11n */
$contractAttributeTypeL11n = ContractAttributeTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $contractAttributeTypeL11n = ContractAttributeTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $contractAttributeTypeL11n, ContractAttributeTypeL11nMapper::class, 'contract_attribute_type_l11n', $request->getOrigin()); $this->deleteModel($request->header->account, $contractAttributeTypeL11n, ContractAttributeTypeL11nMapper::class, 'contract_attribute_type_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $contractAttributeTypeL11n); $this->createStandardDeleteResponse($request, $response, $contractAttributeTypeL11n);
} }
@ -366,7 +366,7 @@ final class ApiAttributeController extends Controller
} }
/** @var AttributeType $old */ /** @var AttributeType $old */
$old = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $old = ContractAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateAttributeTypeFromRequest($request, clone $old); $new = $this->updateAttributeTypeFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin());
@ -398,7 +398,7 @@ final class ApiAttributeController extends Controller
} }
/** @var AttributeType $contractAttributeType */ /** @var AttributeType $contractAttributeType */
$contractAttributeType = ContractAttributeTypeMapper::get()->with('defaults')->where('id', (int) $request->getData('id'))->execute(); $contractAttributeType = ContractAttributeTypeMapper::get()->with('defaults')->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $contractAttributeType, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin()); $this->deleteModel($request->header->account, $contractAttributeType, ContractAttributeTypeMapper::class, 'contract_attribute_type', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $contractAttributeType); $this->createStandardDeleteResponse($request, $response, $contractAttributeType);
} }
@ -426,7 +426,7 @@ final class ApiAttributeController extends Controller
} }
/** @var AttributeValue $old */ /** @var AttributeValue $old */
$old = ContractAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = ContractAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
/** @var \Modules\Attribute\Models\Attribute $attr */ /** @var \Modules\Attribute\Models\Attribute $attr */
$attr = ContractAttributeMapper::get() $attr = ContractAttributeMapper::get()
@ -466,7 +466,7 @@ final class ApiAttributeController extends Controller
// } // }
// /** @var AttributeValue $contractAttributeValue */ // /** @var AttributeValue $contractAttributeValue */
// $contractAttributeValue = ContractAttributeValueMapper::get()->where('id', (int) $request->getData('id'))->execute(); // $contractAttributeValue = ContractAttributeValueMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
// $this->deleteModel($request->header->account, $contractAttributeValue, ContractAttributeValueMapper::class, 'contract_attribute_value', $request->getOrigin()); // $this->deleteModel($request->header->account, $contractAttributeValue, ContractAttributeValueMapper::class, 'contract_attribute_value', $request->getOrigin());
// $this->createStandardDeleteResponse($request, $response, $contractAttributeValue); // $this->createStandardDeleteResponse($request, $response, $contractAttributeValue);
} }
@ -494,7 +494,7 @@ final class ApiAttributeController extends Controller
} }
/** @var BaseStringL11n $old */ /** @var BaseStringL11n $old */
$old = ContractAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id')); $old = ContractAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0);
$new = $this->updateAttributeValueL11nFromRequest($request, clone $old); $new = $this->updateAttributeValueL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ContractAttributeValueL11nMapper::class, 'contract_attribute_value_l11n', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ContractAttributeValueL11nMapper::class, 'contract_attribute_value_l11n', $request->getOrigin());
@ -524,7 +524,7 @@ final class ApiAttributeController extends Controller
} }
/** @var BaseStringL11n $contractAttributeValueL11n */ /** @var BaseStringL11n $contractAttributeValueL11n */
$contractAttributeValueL11n = ContractAttributeValueL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $contractAttributeValueL11n = ContractAttributeValueL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $contractAttributeValueL11n, ContractAttributeValueL11nMapper::class, 'contract_attribute_value_l11n', $request->getOrigin()); $this->deleteModel($request->header->account, $contractAttributeValueL11n, ContractAttributeValueL11nMapper::class, 'contract_attribute_value_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $contractAttributeValueL11n); $this->createStandardDeleteResponse($request, $response, $contractAttributeValueL11n);
} }

8
Controller/ApiContractTypeController.php
View File

@ -192,7 +192,7 @@ final class ApiContractTypeController extends Controller
} }
/** @var BaseStringL11nType $old */ /** @var BaseStringL11nType $old */
$old = ContractTypeMapper::get()->where('id', (int) $request->getData('id')); $old = ContractTypeMapper::get()->where('id', $request->getDataInt('id') ?? 0);
$new = $this->updateContractTypeFromRequest($request, clone $old); $new = $this->updateContractTypeFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ContractTypeMapper::class, 'contract_type', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ContractTypeMapper::class, 'contract_type', $request->getOrigin());
@ -262,7 +262,7 @@ final class ApiContractTypeController extends Controller
} }
/** @var BaseStringL11nType $contractType */ /** @var BaseStringL11nType $contractType */
$contractType = ContractTypeMapper::get()->where('id', (int) $request->getData('id'))->execute(); $contractType = ContractTypeMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $contractType, ContractTypeMapper::class, 'contract_type', $request->getOrigin()); $this->deleteModel($request->header->account, $contractType, ContractTypeMapper::class, 'contract_type', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $contractType); $this->createStandardDeleteResponse($request, $response, $contractType);
} }
@ -309,7 +309,7 @@ final class ApiContractTypeController extends Controller
} }
/** @var BaseStringL11n $old */ /** @var BaseStringL11n $old */
$old = ContractTypeL11nMapper::get()->where('id', (int) $request->getData('id')); $old = ContractTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0);
$new = $this->updateContractTypeL11nFromRequest($request, clone $old); $new = $this->updateContractTypeL11nFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ContractTypeL11nMapper::class, 'contract_type_l11n', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ContractTypeL11nMapper::class, 'contract_type_l11n', $request->getOrigin());
@ -376,7 +376,7 @@ final class ApiContractTypeController extends Controller
} }
/** @var BaseStringL11n $contractTypeL11n */ /** @var BaseStringL11n $contractTypeL11n */
$contractTypeL11n = ContractTypeL11nMapper::get()->where('id', (int) $request->getData('id'))->execute(); $contractTypeL11n = ContractTypeL11nMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $contractTypeL11n, ContractTypeL11nMapper::class, 'contract_type_l11n', $request->getOrigin()); $this->deleteModel($request->header->account, $contractTypeL11n, ContractTypeL11nMapper::class, 'contract_type_l11n', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $contractTypeL11n); $this->createStandardDeleteResponse($request, $response, $contractTypeL11n);
} }

4
Controller/ApiController.php
View File

@ -212,7 +212,7 @@ final class ApiController extends Controller
} }
/** @var \Modules\ContractManagement\Models\Contract $old */ /** @var \Modules\ContractManagement\Models\Contract $old */
$old = ContractMapper::get()->where('id', (int) $request->getData('id'))->execute(); $old = ContractMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$new = $this->updateContractFromRequest($request, clone $old); $new = $this->updateContractFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ContractMapper::class, 'contract', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ContractMapper::class, 'contract', $request->getOrigin());
@ -290,7 +290,7 @@ final class ApiController extends Controller
} }
/** @var \Modules\ContractManagement\Models\Contract $contract */ /** @var \Modules\ContractManagement\Models\Contract $contract */
$contract = ContractMapper::get()->where('id', (int) $request->getData('id'))->execute(); $contract = ContractMapper::get()->where('id', $request->getDataInt('id') ?? 0)->execute();
$this->deleteModel($request->header->account, $contract, ContractMapper::class, 'contract', $request->getOrigin()); $this->deleteModel($request->header->account, $contract, ContractMapper::class, 'contract', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $contract); $this->createStandardDeleteResponse($request, $response, $contract);
} }

10
Controller/BackendController.php
View File

@ -131,7 +131,7 @@ final class BackendController extends Controller
$view->data['type'] = ContractTypeMapper::get() $view->data['type'] = ContractTypeMapper::get()
->with('l11n') ->with('l11n')
->where('l11n/language', $response->header->l11n->language) ->where('l11n/language', $response->header->l11n->language)
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->execute(); ->execute();
$view->data['l11nView'] = new \Web\Backend\Views\L11nView($this->app->l11nManager, $request, $response); $view->data['l11nView'] = new \Web\Backend\Views\L11nView($this->app->l11nManager, $request, $response);
@ -219,7 +219,7 @@ final class BackendController extends Controller
->with('attributes/value/l11n') ->with('attributes/value/l11n')
->with('files') ->with('files')
->with('notes') ->with('notes')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->where('attributes/type/l11n/language', $response->header->l11n->language) ->where('attributes/type/l11n/language', $response->header->l11n->language)
->where('attributes/value/l11n/language', [$response->header->l11n->language, null]) ->where('attributes/value/l11n/language', [$response->header->l11n->language, null])
->sort('files/id', OrderType::DESC) ->sort('files/id', OrderType::DESC)
@ -227,7 +227,7 @@ final class BackendController extends Controller
$view->data['children'] = ContractMapper::getAll() $view->data['children'] = ContractMapper::getAll()
->with('account') ->with('account')
->where('parent', (int) $request->getData('id')) ->where('parent', $request->getDataInt('id') ?? 0)
->sort('createdAt', OrderType::DESC) ->sort('createdAt', OrderType::DESC)
->executeGetArray(); ->executeGetArray();
@ -302,7 +302,7 @@ final class BackendController extends Controller
->with('l11n') ->with('l11n')
->with('defaults') ->with('defaults')
->with('defaults/l11n') ->with('defaults/l11n')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->where('l11n/language', $response->header->l11n->language) ->where('l11n/language', $response->header->l11n->language)
->where('defaults/l11n/language', [$response->header->l11n->language, null]) ->where('defaults/l11n/language', [$response->header->l11n->language, null])
->execute(); ->execute();
@ -386,7 +386,7 @@ final class BackendController extends Controller
$view->attribute = ContractAttributeValueMapper::get() $view->attribute = ContractAttributeValueMapper::get()
->with('l11n') ->with('l11n')
->where('id', (int) $request->getData('id')) ->where('id', $request->getDataInt('id') ?? 0)
->where('l11n/language', [$response->header->l11n->language, null]) ->where('l11n/language', [$response->header->l11n->language, null])
->execute(); ->execute();