github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 03:59:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for new activity API

Browse Source
This commit is contained in:
Toby Zerner 2015-05-21 06:49:27 +09:30
parent cfb6ad7902
commit 7ab72a5f28
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/tags/js/bootstrap.js vendored
View File

@ -217,7 +217,7 @@ app.initializers.add('categories', function() {
// Add a category label next to the discussion title in post activity items.
extend(PostedActivity.prototype, 'headerItems', function(items) {
var category = this.props.activity.post().discussion().category();
var category = this.props.activity.subject().discussion().category();
if (category) {
items.add('category', categoryLabel(category));
}

4
extensions/tags/src/CategoriesServiceProvider.php
View File

@ -40,10 +40,12 @@ class CategoriesServiceProvider extends ServiceProvider
new Relationship('Flarum\Core\Models\Discussion', 'belongsTo', 'category', 'Flarum\Categories\Category'),
new SerializeRelationship('Flarum\Api\Serializers\DiscussionSerializer', 'hasOne', 'category', 'Flarum\Categories\CategorySerializer'),
new SerializeRelationship('Flarum\Api\Serializers\DiscussionBasicSerializer', 'hasOne', 'category', 'Flarum\Categories\CategorySerializer'),
new ApiInclude(['discussions.index', 'discussions.show'], 'category', true),
new ApiInclude(['activity.index'], 'subject.discussion.category', true),
(new Permission('discussion.move'))
->serialize()
->grant(function ($grant, $user) {