Skip to content

Commit 984a384

Browse files
authored
Bug fixes and better restrictions for protected tags (#11)
* Fix CSS issue where display: none was not enforced, causing gaps within the sidebar. * Fixed inconsistency with variable not being boolean values. * Fix widget support bug, where editing tag with icon would crash when children isn't available. Fix protection tag should be hidden for Tags Page for secondary tags. Cloud function used for TagsPage Fix child tag being shown on TagsPage if they should be hidden from view Fix lastDiscussion for tag, showing protected tag Added Protected view for DiscussionList, this can be hidden or displayed using the new settings options * Fix issue where clicking on discussion will reload the page once, added hash to prevent refresh
1 parent c78b1dc commit 984a384

File tree

14 files changed

+541
-74
lines changed

14 files changed

+541
-74
lines changed

extend.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
use Datlechin\TagPasswords\Access\ScopeDiscussionVisibilityForAbility;
1515
use Datlechin\TagPasswords\Api\Controller\AuthController;
1616
use Datlechin\TagPasswords\Listener\AddTagAttributes;
17+
use Datlechin\TagPasswords\Listener\AddDiscussionAttributes;
1718
use Datlechin\TagPasswords\Listener\SavePasswordToDatabase;
1819
use Flarum\Discussion\Discussion;
1920
use Flarum\Extend;
2021
use Flarum\Tags\Api\Serializer\TagSerializer;
22+
use Flarum\Api\Serializer\DiscussionSerializer;
2123
use Flarum\Tags\Event\Saving;
2224

2325
return [
@@ -36,6 +38,9 @@
3638
(new Extend\ApiSerializer(TagSerializer::class))
3739
->attributes(AddTagAttributes::class),
3840

41+
(new Extend\ApiSerializer(DiscussionSerializer::class))
42+
->attributes(AddDiscussionAttributes::class),
43+
3944
(new Extend\Routes('api'))
4045
->post('/datlechin/tag-passwords/auth', 'datlechin-tag-passwords.auth', AuthController::class),
4146

@@ -45,5 +50,9 @@
4550
(new Extend\Settings())
4651
->default('flarum-tag-passwords.display_unlock_icon', true)
4752
->default('flarum-tag-passwords.display_protected_tag_from_sidebar', true)
48-
->default('flarum-tag-passwords.display_protected_tag_from_tags_page', true),
53+
->default('flarum-tag-passwords.display_protected_tag_from_tags_page', true)
54+
->default('flarum-tag-passwords.display_protected_tag_from_discussion_list', false)
55+
->default('flarum-tag-passwords.display_discussion_avator', false)
56+
->serializeToForum('flarum-tag-passwords.displayProtectedTagForDiscussionList', 'flarum-tag-passwords.display_protected_tag_from_discussion_list', 'boolval', false)
57+
->serializeToForum('flarum-tag-passwords.displayDiscussionAvator', 'flarum-tag-passwords.display_discussion_avator', 'boolval', false)
4958
];

js/dist/admin.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)