Skip to content

fix: 追加したパブリックルームをトップページとして一番上に移動しても表示されるように修正 #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akagane99 merged 3 commits into from
Dec 27, 2018
Merged

fix: 追加したパブリックルームをトップページとして一番上に移動しても表示されるように修正 #509

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d219f4
Update CurrentPage.php
akagane99 Dec 13, 2018
fa8ca8d
Update CurrentPage.php
akagane99 Dec 13, 2018
7ed4947
fix: conditionsの中身をチェックしてからunbindModelする
akagane99 Dec 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions Utility/CurrentPage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,13 @@ public function setTopPage() {
}

$result = $this->__getPage(array(
'recursive' => -1,
//'recursive' => -1,
'recursive' => 0,
'conditions' => array(
'Page.room_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')
Expand Down Expand Up @@ -310,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);
Expand Down