##// END OF EJS Templates
Removed archive as a separate entity. Archived threads are saved in the same...
neko259 -
r652:a441eded default
parent child Browse files
Show More
@@ -48,7 +48,6 b''
48 <div class="navigation_panel">
48 <div class="navigation_panel">
49 {% block metapanel %}{% endblock %}
49 {% block metapanel %}{% endblock %}
50 [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
50 [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
51 [<a href="{% url "archive" %}">{% trans 'Archive' %}</a>]
52 {% with ppd=posts_per_day|floatformat:2 %}
51 {% with ppd=posts_per_day|floatformat:2 %}
53 {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
52 {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
54 {% endwith %}
53 {% endwith %}
@@ -1,7 +1,7 b''
1 from django.conf.urls import patterns, url, include
1 from django.conf.urls import patterns, url, include
2 from boards import views
2 from boards import views
3 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
3 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
4 from boards.views import api, tag_threads, all_threads, archived_threads, \
4 from boards.views import api, tag_threads, all_threads, \
5 login, settings, all_tags
5 login, settings, all_tags
6 from boards.views.authors import AuthorsView
6 from boards.views.authors import AuthorsView
7 from boards.views.delete_post import DeletePostView
7 from boards.views.delete_post import DeletePostView
@@ -21,10 +21,6 b" urlpatterns = patterns('',"
21 url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
21 url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
22 name='index'),
22 name='index'),
23
23
24 url(r'^archive/$', archived_threads.ArchiveView.as_view(), name='archive'),
25 url(r'^archive/page/(?P<page>\w+)/$',
26 archived_threads.ArchiveView.as_view(), name='archive'),
27
28 # login page
24 # login page
29 url(r'^login/$', login.LoginView.as_view(), name='login'),
25 url(r'^login/$', login.LoginView.as_view(), name='login'),
30
26
@@ -130,5 +130,5 b' class AllThreadsView(PostMixin, BaseBoar'
130 Gets list of threads that will be shown on a page.
130 Gets list of threads that will be shown on a page.
131 """
131 """
132
132
133 return Thread.objects.filter(archived=False).order_by('-bump_time')\
133 return Thread.objects.all().order_by('-bump_time')\
134 .exclude(tags__in=self.user.hidden_tags.all()) No newline at end of file
134 .exclude(tags__in=self.user.hidden_tags.all())
@@ -14,7 +14,7 b' class TagView(AllThreadsView, Dispatcher'
14 def get_threads(self):
14 def get_threads(self):
15 tag = get_object_or_404(Tag, name=self.tag_name)
15 tag = get_object_or_404(Tag, name=self.tag_name)
16
16
17 return tag.threads.filter(archived=False).order_by('-bump_time')
17 return tag.threads.all().order_by('-bump_time')
18
18
19 def get_context_data(self, **kwargs):
19 def get_context_data(self, **kwargs):
20 context = super(TagView, self).get_context_data(**kwargs)
20 context = super(TagView, self).get_context_data(**kwargs)
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now