mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-21 23:56:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into visibility-scoping

Browse Source
This commit is contained in:
Toby Zerner
2018-01-27 09:26:14 +10:30
parent 77d33c8604 b1ed9d4d1d
commit 8060bb78ac
5 changed files with 29 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/tags/LICENSE
View File

@@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2014-2017 Toby Zerner Copyright (c) 2014-2018 Toby Zerner
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

41
extensions/tags/bootstrap.php
View File

@@ -9,23 +9,34 @@
* file that was distributed with this source code. * file that was distributed with this source code.
*/ */
use Flarum\Extend;
use Flarum\Tags\Access; use Flarum\Tags\Access;
use Flarum\Tags\Listener; use Flarum\Tags\Listener;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
return function (Dispatcher $events) { return [
$events->subscribe(Listener\AddClientAssets::class); (new Extend\Assets('forum'))
$events->subscribe(Listener\AddDiscussionTagsRelationship::class); ->asset(__DIR__.'/js/forum/dist/extension.js')
$events->subscribe(Listener\AddForumTagsRelationship::class); ->asset(__DIR__.'/less/forum/extension.less')
$events->subscribe(Listener\AddTagsApi::class); ->bootstrapper('flarum/tags/main'),
$events->subscribe(Listener\CreatePostWhenTagsAreChanged::class); (new Extend\Assets('admin'))
$events->subscribe(Listener\FilterDiscussionListByTags::class); ->asset(__DIR__.'/js/admin/dist/extension.js')
$events->subscribe(Listener\FilterPostsQueryByTag::class); ->asset(__DIR__.'/less/admin/extension.less')
$events->subscribe(Listener\SaveTagsToDatabase::class); ->bootstrapper('flarum/tags/main'),
$events->subscribe(Listener\UpdateTagMetadata::class); function (Dispatcher $events) {
$events->subscribe(Listener\AddClientAssets::class);
$events->subscribe(Listener\AddDiscussionTagsRelationship::class);
$events->subscribe(Listener\AddForumTagsRelationship::class);
$events->subscribe(Listener\AddTagsApi::class);
$events->subscribe(Listener\CreatePostWhenTagsAreChanged::class);
$events->subscribe(Listener\FilterDiscussionListByTags::class);
$events->subscribe(Listener\FilterPostsQueryByTag::class);
$events->subscribe(Listener\SaveTagsToDatabase::class);
$events->subscribe(Listener\UpdateTagMetadata::class);
$events->subscribe(Access\GlobalPolicy::class); $events->subscribe(Access\GlobalPolicy::class);
$events->subscribe(Access\DiscussionPolicy::class); $events->subscribe(Access\DiscussionPolicy::class);
$events->subscribe(Access\TagPolicy::class); $events->subscribe(Access\TagPolicy::class);
$events->subscribe(Access\FlagPolicy::class); $events->subscribe(Access\FlagPolicy::class);
}; },
];

2
extensions/tags/src/Access/DiscussionPolicy.php
View File

@@ -45,7 +45,7 @@ class DiscussionPolicy extends AbstractPolicy
* @param Discussion $discussion * @param Discussion $discussion
* @return bool * @return bool
*/ */
public function after(User $actor, $ability, Discussion $discussion) public function can(User $actor, $ability, Discussion $discussion)
{ {
// Wrap all discussion permission checks with some logic pertaining to // Wrap all discussion permission checks with some logic pertaining to
// the discussion's tags. If the discussion has a tag that has been // the discussion's tags. If the discussion has a tag that has been

24
extensions/tags/src/Listener/AddClientAssets.php
View File

@@ -12,7 +12,6 @@
namespace Flarum\Tags\Listener; namespace Flarum\Tags\Listener;
use Flarum\Event\ConfigureForumRoutes; use Flarum\Event\ConfigureForumRoutes;
use Flarum\Frontend\Event\Rendering;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
class AddClientAssets class AddClientAssets
@@ -22,32 +21,9 @@ class AddClientAssets
*/ */
public function subscribe(Dispatcher $events) public function subscribe(Dispatcher $events)
{ {
$events->listen(Rendering::class, [$this, 'addAssets']);
$events->listen(ConfigureForumRoutes::class, [$this, 'addRoutes']); $events->listen(ConfigureForumRoutes::class, [$this, 'addRoutes']);
} }
/**
* @param Rendering $app
*/
public function addAssets(Rendering $app)
{
if ($app->isForum()) {
$app->addAssets([
__DIR__.'/../../js/forum/dist/extension.js',
__DIR__.'/../../less/forum/extension.less'
]);
$app->addBootstrapper('flarum/tags/main');
}
if ($app->isAdmin()) {
$app->addAssets([
__DIR__.'/../../js/admin/dist/extension.js',
__DIR__.'/../../less/admin/extension.less'
]);
$app->addBootstrapper('flarum/tags/main');
}
}
/** /**
* @param ConfigureForumRoutes $routes * @param ConfigureForumRoutes $routes
*/ */

2
extensions/tags/src/Listener/FilterDiscussionListByTags.php
View File

@@ -11,8 +11,8 @@
namespace Flarum\Tags\Listener; namespace Flarum\Tags\Listener;
use Flarum\Event\ConfigureDiscussionGambits;
use Flarum\Discussion\Event\Searching; use Flarum\Discussion\Event\Searching;
use Flarum\Event\ConfigureDiscussionGambits;
use Flarum\Tags\Gambit\TagGambit; use Flarum\Tags\Gambit\TagGambit;
use Flarum\Tags\Tag; use Flarum\Tags\Tag;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;