diff --git a/Controller/MultidatabaseContentsController.php b/Controller/MultidatabaseContentsController.php index c65a707..d67e2c8 100644 --- a/Controller/MultidatabaseContentsController.php +++ b/Controller/MultidatabaseContentsController.php @@ -19,6 +19,7 @@ * * @author Tomoyuki OHNO (Ricksoft Co., Ltd.) * @package NetCommons\Multidatabases\Controller + * @SuppressWarnings(PHPMD.ExcessiveClassComplexity) */ class MultidatabaseContentsController extends MultidatabasesAppController { @@ -407,6 +408,7 @@ public function download() { * 検索 * * @return void + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ public function search() { // クエリを取得する @@ -442,6 +444,9 @@ public function search() { } $searchConds = $this->MultidatabaseContentSearch->getSearchConds($query); + if (!$searchConds) { + $searchConds = ['conditions' => [], 'order' => []]; + } $conditions = $this->__listBase($searchConds['conditions']); // paginatorへ渡すための条件を取得する diff --git a/Model/MultidatabaseContent.php b/Model/MultidatabaseContent.php index eadd57f..d9fdc36 100644 --- a/Model/MultidatabaseContent.php +++ b/Model/MultidatabaseContent.php @@ -381,6 +381,8 @@ public function deleteContentByKey($key) { 'MultidatabaseContent.Key' => $key, ]; + $this->Behaviors->load('Topics.Topics'); + if ($result = $this->deleteAll($conditions, true, true)) { $this->commit(); } else { diff --git a/Model/MultidatabaseContentSearch.php b/Model/MultidatabaseContentSearch.php index 138e1b3..1eca98f 100644 --- a/Model/MultidatabaseContentSearch.php +++ b/Model/MultidatabaseContentSearch.php @@ -181,7 +181,11 @@ public function getCondSortOrder($sortCol = '') { $sortColDir = 'desc'; } - $sortOrder = ['MultidatabaseContent.' . $sortCol => $sortColDir]; + $sortOrder = [ + 'MultidatabaseContent.' . $sortCol => $sortColDir, + 'MultidatabaseContent.created' => $sortColDir, + 'MultidatabaseContent.id' => $sortColDir + ]; return $sortOrder; }