From 5d219f462cdb702d26f89bf339178ca6bc65e446 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Thu, 13 Dec 2018 12:34:54 +0900 Subject: [PATCH 1/3] Update CurrentPage.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: 追加したパブリックルームをトップページとして一番上に移動しても表示されるように修正 --- Utility/CurrentPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utility/CurrentPage.php b/Utility/CurrentPage.php index ef324a47..68227a4d 100644 --- a/Utility/CurrentPage.php +++ b/Utility/CurrentPage.php @@ -268,7 +268,7 @@ public function setTopPage() { $result = $this->__getPage(array( 'recursive' => -1, 'conditions' => array( - 'Page.room_id' => Space::getRoomIdRoot(Space::PUBLIC_SPACE_ID), + 'Page.root_id' => Space::getRoomIdRoot(Space::PUBLIC_SPACE_ID), 'Page.parent_id NOT' => null, ), 'order' => array('Page.sort_key' => 'asc') From fa8ca8d3ce817e2c34e0a3210ac683a7d6ab7ac6 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Thu, 13 Dec 2018 19:38:46 +0900 Subject: [PATCH 2/3] Update CurrentPage.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: パブリックルームのトップページ取得は、パブリックルームが複数ありえるため、スペースIDを指定して取得する --- Utility/CurrentPage.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Utility/CurrentPage.php b/Utility/CurrentPage.php index 68227a4d..5c8acd42 100644 --- a/Utility/CurrentPage.php +++ b/Utility/CurrentPage.php @@ -266,9 +266,13 @@ public function setTopPage() { } $result = $this->__getPage(array( - 'recursive' => -1, + //'recursive' => -1, + 'recursive' => 0, 'conditions' => array( - 'Page.root_id' => Space::getRoomIdRoot(Space::PUBLIC_SPACE_ID), + // パブリックルームのトップページ取得は、パブリックルームが複数ありえるため、スペースIDを指定して取得する + //'Page.root_id' => Space::getRoomIdRoot(Space::PUBLIC_SPACE_ID), + 'Page.room_id' => 'Room.id', + 'Room.space_id' => Space::PUBLIC_SPACE_ID, 'Page.parent_id NOT' => null, ), 'order' => array('Page.sort_key' => 'asc') From 7ed49477a7dd2a4909990b3342752c19e0a6bff8 Mon Sep 17 00:00:00 2001 From: Mitsuru Mutaguchi Date: Tue, 25 Dec 2018 17:53:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20conditions=E3=81=AE=E4=B8=AD?= =?UTF-8?q?=E8=BA=AB=E3=82=92=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=8B=E3=82=89unbindModel=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utility/CurrentPage.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Utility/CurrentPage.php b/Utility/CurrentPage.php index 5c8acd42..f9a5a81c 100644 --- a/Utility/CurrentPage.php +++ b/Utility/CurrentPage.php @@ -314,7 +314,20 @@ private function __getPage($query) { $this->Page->alias . '.theme', ]; - if (! empty(Current::$request->params['requested'])) { + // conditionsにRoom, Spaceを使ってるか + $conditionKeys = array_keys($query['conditions']); + $isRoomOrSpace = false; + foreach ($conditionKeys as $conditionKey) { + $isRoom = preg_match('/^Room\./', $conditionKey); + $isSpace = preg_match('/^Space\./', $conditionKey); + if ($isRoom || $isSpace) { + $isRoomOrSpace = true; + break; + } + } + + // requestedあり, conditionsにRoom, Spaceを使ってない + if (! empty(Current::$request->params['requested']) && ! $isRoomOrSpace) { $this->Page->unbindModel(array( 'belongsTo' => array('Room'), ), true);