Jingga/oms-Admin
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Admin.git synced 2026-02-12 18:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-08-28 22:06:33 +00:00
parent df9ba74f3d
commit 70eeb1995f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Controller/ApiController.php
View File

@ -1152,10 +1152,10 @@ final class ApiController extends Controller
*/ */
private function updateGroupFromRequest(RequestAbstract $request, Group $group) : Group private function updateGroupFromRequest(RequestAbstract $request, Group $group) : Group
{ {
$group->name = (string) ($request->getData('name') ?? $group->name); $group->name = $request->getDataString('name') ?? $group->name;
$group->setStatus($request->getDataInt('status') ?? $group->getStatus()); $group->setStatus($request->getDataInt('status') ?? $group->getStatus());
$group->description = Markdown::parse((string) ($request->getData('description') ?? $group->descriptionRaw)); $group->description = Markdown::parse($request->getDataString('description') ?? $group->descriptionRaw);
$group->descriptionRaw = (string) ($request->getData('description') ?? $group->descriptionRaw); $group->descriptionRaw = $request->getDataString('description') ?? $group->descriptionRaw;
return $group; return $group;
} }
@ -2100,7 +2100,7 @@ final class ApiController extends Controller
public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void public function apiAccountDelete(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : void
{ {
/** @var Account $account */ /** @var Account $account */
$account = AccountMapper::get()->where('id', (int) ($request->getData('id')))->execute(); $account = AccountMapper::get()->where('id', (int) $request->getData('id'))->execute();
$this->deleteModel($request->header->account, $account, AccountMapper::class, 'account', $request->getOrigin()); $this->deleteModel($request->header->account, $account, AccountMapper::class, 'account', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $account); $this->createStandardDeleteResponse($request, $response, $account);
} }

2
Controller/BackendController.php
View File

@ -398,7 +398,7 @@ final class BackendController extends Controller
->with('createdBy') ->with('createdBy')
->where('module', self::NAME) ->where('module', self::NAME)
->where('type', StringUtils::intHash(GroupMapper::class)) ->where('type', StringUtils::intHash(GroupMapper::class))
->where('ref', (string) ($request->getData('id') ?? '0')) ->where('ref', $request->getDataString('id') ?? '0')
->limit(25); ->limit(25);
// audit log // audit log

2
Models/Module.php
View File

@ -124,6 +124,8 @@ class Module
* *
* @return void * @return void
* *
* @throws InvalidEnumValue
*
* @since 1.0.0 * @since 1.0.0
*/ */
public function setStatus(int $status) : void public function setStatus(int $status) : void

4
tests/Autoloader.php
View File

@ -71,14 +71,12 @@ final class Autoloader
* *
* @return void * @return void
* *
* @throws AutoloadException Throws this exception if the class to autoload doesn't exist. This could also be related to a wrong namespace/file path correlation.
*
* @since 1.0.0 * @since 1.0.0
*/ */
public static function defaultAutoloader(string $class) : void public static function defaultAutoloader(string $class) : void
{ {
$class = \ltrim($class, '\\'); $class = \ltrim($class, '\\');
$class = \str_replace(['_', '\\'], '/', $class); $class = \strtr($class, '_\\', '//');
foreach (self::$paths as $path) { foreach (self::$paths as $path) {
$file = $path . $class . '.php'; $file = $path . $class . '.php';