Show More
@@ -26,7 +26,7 b' class SettingsManager:' | |||||
26 | def __init__(self): |
|
26 | def __init__(self): | |
27 | pass |
|
27 | pass | |
28 |
|
28 | |||
29 | def get_theme(self): |
|
29 | def get_theme(self) -> str: | |
30 | theme = self.get_setting(SETTING_THEME) |
|
30 | theme = self.get_setting(SETTING_THEME) | |
31 | if not theme: |
|
31 | if not theme: | |
32 | theme = DEFAULT_THEME |
|
32 | theme = DEFAULT_THEME | |
@@ -66,7 +66,7 b' class SettingsManager:' | |||||
66 | permissions.remove(permission) |
|
66 | permissions.remove(permission) | |
67 | self.set_setting(SETTING_PERMISSIONS, permissions) |
|
67 | self.set_setting(SETTING_PERMISSIONS, permissions) | |
68 |
|
68 | |||
69 | def get_fav_tags(self): |
|
69 | def get_fav_tags(self) -> list: | |
70 | tag_names = self.get_setting(SETTING_FAVORITE_TAGS) |
|
70 | tag_names = self.get_setting(SETTING_FAVORITE_TAGS) | |
71 | tags = [] |
|
71 | tags = [] | |
72 | if tag_names: |
|
72 | if tag_names: | |
@@ -90,7 +90,7 b' class SettingsManager:' | |||||
90 | tags.remove(tag.name) |
|
90 | tags.remove(tag.name) | |
91 | self.set_setting(SETTING_FAVORITE_TAGS, tags) |
|
91 | self.set_setting(SETTING_FAVORITE_TAGS, tags) | |
92 |
|
92 | |||
93 | def get_hidden_tags(self): |
|
93 | def get_hidden_tags(self) -> list: | |
94 | tag_names = self.get_setting(SETTING_HIDDEN_TAGS) |
|
94 | tag_names = self.get_setting(SETTING_HIDDEN_TAGS) | |
95 | tags = [] |
|
95 | tags = [] | |
96 | if tag_names: |
|
96 | if tag_names: |
@@ -43,7 +43,6 b'' | |||||
43 | <div class="form-submit"> |
|
43 | <div class="form-submit"> | |
44 | <input type="submit" value="{% trans "Post" %}"/> |
|
44 | <input type="submit" value="{% trans "Post" %}"/> | |
45 | </div> |
|
45 | </div> | |
46 | (ctrl-enter) |
|
|||
47 | </form> |
|
46 | </form> | |
48 | </div> |
|
47 | </div> | |
49 | <div><a href="{% url "staticpage" name="help" %}"> |
|
48 | <div><a href="{% url "staticpage" name="help" %}"> |
@@ -2,7 +2,7 b' from django.shortcuts import get_object_' | |||||
2 |
|
2 | |||
3 | from boards.abstracts.settingsmanager import get_settings_manager, \ |
|
3 | from boards.abstracts.settingsmanager import get_settings_manager, \ | |
4 | SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS |
|
4 | SETTING_FAVORITE_TAGS, SETTING_HIDDEN_TAGS | |
5 |
from boards.models import Tag |
|
5 | from boards.models import Tag | |
6 | from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE |
|
6 | from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE | |
7 | from boards.views.mixins import DispatcherMixin, RedirectNextMixin |
|
7 | from boards.views.mixins import DispatcherMixin, RedirectNextMixin | |
8 | from boards.forms import ThreadForm, PlainErrorList |
|
8 | from boards.forms import ThreadForm, PlainErrorList | |
@@ -22,8 +22,15 b' class TagView(AllThreadsView, Dispatcher' | |||||
22 | def get_threads(self): |
|
22 | def get_threads(self): | |
23 | tag = get_object_or_404(Tag, name=self.tag_name) |
|
23 | tag = get_object_or_404(Tag, name=self.tag_name) | |
24 |
|
24 | |||
|
25 | hidden_tags = self.settings_manager.get_hidden_tags() | |||
|
26 | ||||
|
27 | try: | |||
|
28 | hidden_tags.remove(tag) | |||
|
29 | except ValueError: | |||
|
30 | pass | |||
|
31 | ||||
25 | return tag.get_threads().exclude( |
|
32 | return tag.get_threads().exclude( | |
26 |
tags__in= |
|
33 | tags__in=hidden_tags) | |
27 |
|
34 | |||
28 | def get_context_data(self, **kwargs): |
|
35 | def get_context_data(self, **kwargs): | |
29 | params = super(TagView, self).get_context_data(**kwargs) |
|
36 | params = super(TagView, self).get_context_data(**kwargs) |
General Comments 0
You need to be logged in to leave comments.
Login now