From 7a3d6b0c20059cc27e6c2021ad72aa0e59b81177 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Mon, 31 Mar 2025 13:45:36 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:2=E3=81=A4=E4=BB=A5=E4=B8=8A=E3=81=AE?= =?UTF-8?q?=E9=81=B8=E6=8A=9E=E5=BC=8F=EF=BC=88=E8=A4=87=E6=95=B0=EF=BC=89?= =?UTF-8?q?=E9=A0=85=E7=9B=AE=E3=81=A7=E7=B5=9E=E3=82=8A=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E3=81=8C=E8=A1=8C=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/MultidatabaseContentSearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/MultidatabaseContentSearch.php b/Model/MultidatabaseContentSearch.php index f809cb7..7cfc2a7 100644 --- a/Model/MultidatabaseContentSearch.php +++ b/Model/MultidatabaseContentSearch.php @@ -133,7 +133,7 @@ public function getCondSelect($values = []) { ); break; case 'checkbox': - $result += $this->MultidatabaseContentSearchCond->getCondSelCheck( + $result[] = $this->MultidatabaseContentSearchCond->getCondSelCheck( $metadata['selections'], $values, $valueKey ); break; From c30aa87b45df29c14b11816680e6d8ae48029e38 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Mon, 31 Mar 2025 13:46:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E4=BD=9C=E6=88=90=E6=97=A5=E6=99=82?= =?UTF-8?q?=E3=81=AE=E6=A4=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/MultidatabaseContentSearchCond.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Model/MultidatabaseContentSearchCond.php b/Model/MultidatabaseContentSearchCond.php index 7ea8dac..cf2dff4 100644 --- a/Model/MultidatabaseContentSearchCond.php +++ b/Model/MultidatabaseContentSearchCond.php @@ -57,20 +57,28 @@ public function getCondSelVal($query) { */ public function getCondStartEndDt($query) { $conditions = []; + + //サーバタイムゾーンの日時に変換 + $date = new DateTime($query['start_dt']['value']); + $createdStart = (new NetCommonsTime())->toServerDatetime($date->format('Y-m-d H:i:s')); + $date = new DateTime($query['end_dt']['value']); + $date->modify('+59 second'); + $createdEnd = (new NetCommonsTime())->toServerDatetime($date->format('Y-m-d H:i:s')); + if ( !empty($query['start_dt']['value']) && !empty($query['end_dt']['value']) ) { $conditions['MultidatabaseContent.created between ? and ?'] = [ - $query['start_dt']['value'], - $query['end_dt']['value'] + $createdStart, + $createdEnd ]; } else { if (!empty($query['start_dt']['value'])) { - $conditions['MultidatabaseContent.created <='] = $query['start_dt']['value']; + $conditions['MultidatabaseContent.created >='] = $createdStart; } if (!empty($query['end_dt']['value'])) { - $conditions['MultidatabaseContent.created >='] = $query['end_dt']['value']; + $conditions['MultidatabaseContent.created <='] = $createdEnd; } } From f4c74979c6ebfbf301f7e4865b628666300ffcf7 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Mon, 31 Mar 2025 13:46:37 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E7=B5=9E=E3=82=8A=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=E3=81=AE=E3=83=97=E3=83=AB=E3=83=80=E3=82=A6=E3=83=B3=E3=82=92?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB1?= =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E7=9B=AE=E3=82=92=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Helper/MultidatabaseContentViewHelper.php | 1 + 1 file changed, 1 insertion(+) diff --git a/View/Helper/MultidatabaseContentViewHelper.php b/View/Helper/MultidatabaseContentViewHelper.php index a87fb73..6806fe8 100644 --- a/View/Helper/MultidatabaseContentViewHelper.php +++ b/View/Helper/MultidatabaseContentViewHelper.php @@ -215,6 +215,7 @@ public function renderGroupItems($metadatas) { public function dropDownToggleSelect($metadatas, $viewType = 'index') { $params = $this->_View->Paginator->params; $named = $params['named']; + $named['page'] = 1; $url = $named; $result = ''; From f3d92e20e054ec4eb6ce57327cfe21c23939f457 Mon Sep 17 00:00:00 2001 From: "G01\\fj2532ir" Date: Tue, 1 Apr 2025 11:52:32 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E6=A4=9C=E7=B4=A2=E7=94=BB=E9=9D=A2?= =?UTF-8?q?=E3=81=8B=E3=82=89=E4=BD=9C=E6=88=90=E8=80=85=E3=81=AE=E9=A0=85?= =?UTF-8?q?=E7=9B=AE=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/MultidatabaseContents/search.ctp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/View/MultidatabaseContents/search.ctp b/View/MultidatabaseContents/search.ctp index 6650f9a..333743e 100644 --- a/View/MultidatabaseContents/search.ctp +++ b/View/MultidatabaseContents/search.ctp @@ -48,15 +48,6 @@ echo $this->NetCommonsHtml->css([ echo $this->NetCommonsForm->input('type', $options); ?> - -
- __d('multidatabases', 'Create user') - ]; - echo $this->NetCommonsForm->input('create_user', $options); - ?> -