# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2014-03-28 14:54:42
# Node ID a441ededbe99e698520a4fde1906f59c6b7ae760
# Parent  582b2d8513e203b66a526105a47c77dfa9218708

Removed archive as a separate entity. Archived threads are saved in the same
output as normal ones

diff --git a/boards/templates/boards/base.html b/boards/templates/boards/base.html
--- a/boards/templates/boards/base.html
+++ b/boards/templates/boards/base.html
@@ -48,7 +48,6 @@
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
-    [<a href="{% url "archive" %}">{% trans 'Archive' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}
diff --git a/boards/urls.py b/boards/urls.py
--- a/boards/urls.py
+++ b/boards/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, url, include
 from boards import views
 from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed
-from boards.views import api, tag_threads, all_threads, archived_threads, \
+from boards.views import api, tag_threads, all_threads, \
         login, settings, all_tags
 from boards.views.authors import AuthorsView
 from boards.views.delete_post import DeletePostView
@@ -21,10 +21,6 @@ urlpatterns = patterns('',
     url(r'^page/(?P<page>\w+)/$', all_threads.AllThreadsView.as_view(),
         name='index'),
 
-    url(r'^archive/$', archived_threads.ArchiveView.as_view(), name='archive'),
-    url(r'^archive/page/(?P<page>\w+)/$',
-        archived_threads.ArchiveView.as_view(), name='archive'),
-
     # login page
     url(r'^login/$', login.LoginView.as_view(), name='login'),
 
diff --git a/boards/views/all_threads.py b/boards/views/all_threads.py
--- a/boards/views/all_threads.py
+++ b/boards/views/all_threads.py
@@ -130,5 +130,5 @@ class AllThreadsView(PostMixin, BaseBoar
         Gets list of threads that will be shown on a page.
         """
 
-        return Thread.objects.filter(archived=False).order_by('-bump_time')\
-            .exclude(tags__in=self.user.hidden_tags.all())
\ No newline at end of file
+        return Thread.objects.all().order_by('-bump_time')\
+            .exclude(tags__in=self.user.hidden_tags.all())
diff --git a/boards/views/archived_threads.py b/boards/views/archived_threads.py
deleted file mode 100644
--- a/boards/views/archived_threads.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from boards.models import Thread
-from boards.views.all_threads import AllThreadsView
-
-__author__ = 'neko259'
-
-
-class ArchiveView(AllThreadsView):
-
-    def get_threads(self):
-        return Thread.objects.filter(archived=True).order_by('-bump_time')
-
-    def get_context_data(self, **kwargs):
-        context = super(ArchiveView, self).get_context_data(**kwargs)
-
-        context['archived'] = True
-
-        return context
diff --git a/boards/views/tag_threads.py b/boards/views/tag_threads.py
--- a/boards/views/tag_threads.py
+++ b/boards/views/tag_threads.py
@@ -14,7 +14,7 @@ class TagView(AllThreadsView, Dispatcher
     def get_threads(self):
         tag = get_object_or_404(Tag, name=self.tag_name)
 
-        return tag.threads.filter(archived=False).order_by('-bump_time')
+        return tag.threads.all().order_by('-bump_time')
 
     def get_context_data(self, **kwargs):
         context = super(TagView, self).get_context_data(**kwargs)