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; 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; } } 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 = ''; 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); - ?> -