github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-11 21:43:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up some relation stuff

Browse Source
This commit is contained in:
Toby Zerner 2015-07-01 22:35:56 +09:30
parent 659ca692e3
commit 09d1c4d8ed
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Api/Serializers/BaseSerializer.php
View File

@ -55,7 +55,7 @@ abstract class BaseSerializer extends SerializerAbstract
$data = $relation($model, $include);
} else {
if ($include) {
$data = $model->getRelation($relation);
$data = $model->$relation;
} elseif ($many) {
$relationIds = $relation.'_ids';
$data = isset($model->$relationIds) ? $model->$relationIds : $model->$relation()->lists('id');

2
framework/core/src/Api/Serializers/DiscussionSerializer.php
View File

@ -13,7 +13,7 @@ class DiscussionSerializer extends DiscussionBasicSerializer
$attributes = parent::attributes($discussion);
$user = $this->actor->getUser();
$state = $discussion->stateFor($user);
$state = $discussion->state;
$attributes += [
'commentsCount' => (int) $discussion->comments_count,

2
framework/core/src/Core/Support/Locked.php
View File

@ -34,6 +34,8 @@ trait Locked
return $can;
}
}
return false;
}
/**