diff --git a/app/Controllers/AbstractWebController.php b/app/Controllers/AbstractWebController.php index a771dbe..44e6e65 100644 --- a/app/Controllers/AbstractWebController.php +++ b/app/Controllers/AbstractWebController.php @@ -81,6 +81,7 @@ abstract class AbstractWebController extends Controller $this->addViewDatas('action', $action); $this->addViewDatas('authContext', $this->getAuthContext()); $this->addViewDatas('classPath', $this->service->getClassPaths(false)); + $this->addViewDatas('uri', $this->request->getUri()); } /** diff --git a/app/DTOs/MylogDTO.php b/app/DTOs/MylogDTO.php index c2ddeb3..78dba81 100644 --- a/app/DTOs/MylogDTO.php +++ b/app/DTOs/MylogDTO.php @@ -6,7 +6,7 @@ class MylogDTO extends CommonDTO { public ?int $uid = null; public ?int $user_uid = null; - public string $title = null; + public string $title = ''; public string $content = ''; public string $status = ''; diff --git a/app/Helpers/CommonHelper.php b/app/Helpers/CommonHelper.php index 687bb42..5ff6113 100644 --- a/app/Helpers/CommonHelper.php +++ b/app/Helpers/CommonHelper.php @@ -252,7 +252,7 @@ abstract class CommonHelper $label, $action, [ - "data-src" => current_url() . '/' . $action . '?' . $viewDatas['uri']->getQuery(), + "data-src" => sprintf("%s/%s?%s", current_url(), $action, service('request')->getUri()->getQuery()), "data-bs-toggle" => "modal", "data-bs-target" => "#modal_action_form", "class" => "btn btn-sm btn-primary form-label-sm", @@ -274,7 +274,7 @@ abstract class CommonHelper $label, $action, [ - "data-src" => current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK() . '?' . $viewDatas['uri']->getQuery(), + "data-src" => sprintf("%s/%s/%s?%s", current_url(), $action, $viewDatas['entity']->getPK(), service('request')->getUri()->getQuery()), "data-bs-toggle" => "modal", "data-bs-target" => "#modal_action_form", 'class' => 'form-label-sm', @@ -287,7 +287,7 @@ abstract class CommonHelper $label, $action, [ - "data-src" => current_url() . '/' . $action . '/' . $viewDatas['entity']->getPK() . '?' . $viewDatas['uri']->getQuery(), + "data-src" => sprintf("%s/%s/%s?%s", current_url(), $action, $viewDatas['entity']->getPK(), service('request')->getUri()->getQuery()), "data-bs-toggle" => "modal", "data-bs-target" => "#modal_action_form", "class" => "btn btn-sm btn-primary form-label-sm", diff --git a/app/Views/cells/chassis/stock.php b/app/Views/cells/chassis/stock.php index 7d52856..4ee2bd3 100644 --- a/app/Views/cells/chassis/stock.php +++ b/app/Views/cells/chassis/stock.php @@ -8,9 +8,7 @@ - getListButton('modify', $entity->getTitle(), $partCellDatas) ?> - - + getListButton('modify', $entity->getTitle(), $partCellDatas) ?> getUsed() ?> getAvailable() ?> getStock() ?>