u/bodqhrohro/swineboard Commit - r652:a441eded

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

neko259 -

r652:a441eded default

parent child

boards/templates/boards/base.html

0 0 -1

             {% load staticfiles %}
             {% load i18n %}
             {% load l10n %}
             {% load static from staticfiles %}
             <!DOCTYPE html>
             <html>
             <head>
                 <link rel="stylesheet" type="text/css"
                     href="{% static 'css/base.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css"
             	href="{% static theme_css %}" media="all"/>
                 <link rel="alternate" type="application/rss+xml" href="rss/" title=
             	"{% trans 'Feed' %}"/>
                 <link rel="icon" type="image/png"
                     href="{% static 'favicon.png' %}">
                 <meta name="viewport" content="width=device-width, initial-scale=1"/>
                 <meta charset="utf-8"/>
                 {% block head %}{% endblock %}
             </head>
             <body>
             <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
             <script src="{% static 'js/jquery-ui-1.10.3.custom.min.js' %}"></script>
             <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
             <script src="{% url 'js_info_dict' %}"></script>
             <div class="navigation_panel">
                 <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
                 {% for tag in tags %}
                     <a class="tag" href="{% url 'tag' tag_name=tag.name %}"
                             >#{{ tag.name }}</a>,
                 {% endfor %}
                 <a href="{% url 'tags' %}" title="{% trans 'Tag management' %}"
                         >[...]</a>
                 <a class="link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
             </div>
             {% block content %}{% endblock %}
             <script src="{% static 'js/popup.js' %}"></script>
             <script src="{% static 'js/image.js' %}"></script>
             <script src="{% static 'js/refpopup.js' %}"></script>
             <script src="{% static 'js/main.js' %}"></script>
             <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 %}
                 <a class="link" href="#top">{% trans 'Up' %}</a>
             </div>
             <div class="footer">
                 <!-- Put your banners here -->
             </div>
             </body>
             </html>

boards/urls.py

0 +1 -5

             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
             from boards.views.ban import BanUserView
             from boards.views.static import StaticPageView
             from boards.views.post_admin import PostAdminView
             js_info_dict = {
                 'packages': ('boards',),
             }
             urlpatterns = patterns('',
                 # /boards/
                 url(r'^$', all_threads.AllThreadsView.as_view(), name='index'),
                 # /boards/page/
                 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'),
                 # /boards/tag/tag_name/
                 url(r'^tag/(?P<tag_name>\w+)/$', tag_threads.TagView.as_view(),
                     name='tag'),
                 # /boards/tag/tag_id/page/
                 url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/$',
                     tag_threads.TagView.as_view(), name='tag'),
                 # /boards/thread/
                 url(r'^thread/(?P<post_id>\w+)/$', views.thread.ThreadView.as_view(),
                     name='thread'),
                 url(r'^thread/(?P<post_id>\w+)/mode/(?P<mode>\w+)/$', views.thread.ThreadView
                     .as_view(), name='thread_mode'),
                 # /boards/post_admin/
                 url(r'^post_admin/(?P<post_id>\w+)/$', PostAdminView.as_view(),
                         name='post_admin'),
                 url(r'^settings/$', settings.SettingsView.as_view(), name='settings'),
                 url(r'^tags/$', all_tags.AllTagsView.as_view(), name='tags'),
                 url(r'^captcha/', include('captcha.urls')),
                 url(r'^authors/$', AuthorsView.as_view(), name='authors'),
                 url(r'^delete/(?P<post_id>\w+)/$', DeletePostView.as_view(),
                         name='delete'),
                 url(r'^ban/(?P<post_id>\w+)/$', BanUserView.as_view(), name='ban'),
                 url(r'^banned/$', views.banned.BannedView.as_view(), name='banned'),
                 url(r'^staticpage/(?P<name>\w+)/$', StaticPageView.as_view(),
                     name='staticpage'),
                 # RSS feeds
                 url(r'^rss/$', AllThreadsFeed()),
                 url(r'^page/(?P<page>\w+)/rss/$', AllThreadsFeed()),
                 url(r'^tag/(?P<tag_name>\w+)/rss/$', TagThreadsFeed()),
                 url(r'^tag/(?P<tag_name>\w+)/page/(?P<page>\w+)/rss/$', TagThreadsFeed()),
                 url(r'^thread/(?P<post_id>\w+)/rss/$', ThreadPostsFeed()),
                 # i18n
                 url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict,
                     name='js_info_dict'),
                 # API
                 url(r'^api/post/(?P<post_id>\w+)/$', api.get_post, name="get_post"),
                 url(r'^api/diff_thread/(?P<thread_id>\w+)/(?P<last_update_time>\w+)/$',
                     api.api_get_threaddiff, name="get_thread_diff"),
                 url(r'^api/threads/(?P<count>\w+)/$', api.api_get_threads,
                         name='get_threads'),
                 url(r'^api/tags/$', api.api_get_tags, name='get_tags'),
                 url(r'^api/thread/(?P<opening_post_id>\w+)/$', api.api_get_thread_posts,
                         name='get_thread'),
                 url(r'^api/add_post/(?P<opening_post_id>\w+)/$', api.api_add_post,
                         name='add_post'),
                 url(r'api/get_tag_popularity/(?P<tag_name>\w+)$', api.get_tag_popularity,
                         name='get_tag_popularity'),
             )

boards/views/all_threads.py

0 +2 -2

             import string
             from django.core.urlresolvers import reverse
             from django.db import transaction
             from django.shortcuts import render, redirect
             from boards import utils
             from boards.abstracts.paginator import get_paginator
             from boards.forms import ThreadForm, PlainErrorList
             from boards.models import Post, Thread, Ban, Tag
             from boards.views.banned import BannedView
             from boards.views.base import BaseBoardView, PARAMETER_FORM
             from boards.views.posting_mixin import PostMixin
             import neboard
             TAG_DELIMITER = ' '
             PARAMETER_CURRENT_PAGE = 'current_page'
             PARAMETER_PAGINATOR = 'paginator'
             PARAMETER_THREADS = 'threads'
             TEMPLATE = 'boards/posting_general.html'
             DEFAULT_PAGE = 1
             class AllThreadsView(PostMixin, BaseBoardView):
                 user = None
                 def get(self, request, page=DEFAULT_PAGE, form=None):
                     context = self.get_context_data(request=request)
                     self.user = context['user']
                     if not form:
                         form = ThreadForm(error_class=PlainErrorList)
                     paginator = get_paginator(self.get_threads(),
                                               neboard.settings.THREADS_PER_PAGE)
                     paginator.current_page = int(page)
                     threads = paginator.page(page).object_list
                     context[PARAMETER_THREADS] = threads
                     context[PARAMETER_FORM] = form
                     self._get_page_context(paginator, context, page)
                     return render(request, TEMPLATE, context)
                 def post(self, request, page=DEFAULT_PAGE):
                     form = ThreadForm(request.POST, request.FILES,
                                       error_class=PlainErrorList)
                     form.session = request.session
                     if form.is_valid():
                         return self.create_thread(request, form)
                     if form.need_to_ban:
                         # Ban user because he is suspected to be a bot
                         self._ban_current_user(request)
                     return self.get(request, page, form)
                 @staticmethod
                 def _get_page_context(paginator, context, page):
                     """
                     Get pagination context variables
                     """
                     context[PARAMETER_PAGINATOR] = paginator
                     context[PARAMETER_CURRENT_PAGE] = paginator.page(int(page))
                 def parse_tags_string(self, tag_strings):
                     """
                     Parses tag list string and returns tag object list.
                     """
                     tags = []
                     if tag_strings:
                         tag_strings = tag_strings.split(TAG_DELIMITER)
                         for tag_name in tag_strings:
                             tag_name = string.lower(tag_name.strip())
                             if len(tag_name) > 0:
                                 tag, created = Tag.objects.get_or_create(name=tag_name)
                                 tags.append(tag)
                     return tags
                 @transaction.atomic
                 def create_thread(self, request, form, html_response=True):
                     """
                     Creates a new thread with an opening post.
                     """
                     ip = utils.get_client_ip(request)
                     is_banned = Ban.objects.filter(ip=ip).exists()
                     if is_banned:
                         if html_response:
                             return redirect(BannedView().as_view())
                         else:
                             return
                     data = form.cleaned_data
                     title = data['title']
                     text = data['text']
                     text = self._remove_invalid_links(text)
                     if 'image' in data.keys():
                         image = data['image']
                     else:
                         image = None
                     tag_strings = data['tags']
                     tags = self.parse_tags_string(tag_strings)
                     post = Post.objects.create_post(title=title, text=text, ip=ip,
                                                     image=image, tags=tags,
                                                     user=self._get_user(request))
                     if html_response:
                         return redirect(post.get_url())
                 def get_threads(self):
                     """
                     Gets list of threads that will be shown on a page.
                     """
-                    return Thread.objects.filter(archived=False).order_by('-bump_time')\
+                    return Thread.objects.all().order_by('-bump_time')\
-                        .exclude(tags__in=self.user.hidden_tags.all())
  No newline at end of file
+                        .exclude(tags__in=self.user.hidden_tags.all())

boards/views/tag_threads.py

0 +1 -1

             from django.shortcuts import get_object_or_404
             from boards.models import Tag, Post
             from boards.views.all_threads import AllThreadsView, DEFAULT_PAGE
             from boards.views.mixins import DispatcherMixin, RedirectNextMixin
             from boards.forms import ThreadForm, PlainErrorList
             __author__ = 'neko259'
             class TagView(AllThreadsView, DispatcherMixin, RedirectNextMixin):
                 tag_name = None
                 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)
                     tag = get_object_or_404(Tag, name=self.tag_name)
                     context['tag'] = tag
                     return context
                 def get(self, request, tag_name, page=DEFAULT_PAGE, form=None):
                     self.tag_name = tag_name
                     dispatch_result = self.dispatch_method(request)
                     if dispatch_result:
                         return dispatch_result
                     else:
                         return super(TagView, self).get(request, page, form)
                 def post(self, request, tag_name, page=DEFAULT_PAGE):
                     form = ThreadForm(request.POST, request.FILES,
                                       error_class=PlainErrorList)
                     form.session = request.session
                     if form.is_valid():
                         return self.create_thread(request, form)
                     if form.need_to_ban:
                         # Ban user because he is suspected to be a bot
                         self._ban_current_user(request)
                     return self.get(request, tag_name, page, form)
                 def subscribe(self, request):
                     user = self._get_user(request)
                     tag = get_object_or_404(Tag, name=self.tag_name)
                     if not tag in user.fav_tags.all():
                         user.add_tag(tag)
                     return self.redirect_to_next(request)
                 def unsubscribe(self, request):
                     user = self._get_user(request)
                     tag = get_object_or_404(Tag, name=self.tag_name)
                     if tag in user.fav_tags.all():
                         user.remove_tag(tag)
                     return self.redirect_to_next(request)
                 def hide(self, request):
                     """
                     Adds tag to user's hidden tags. Threads with this tag will not be
                     shown.
                     """
                     user = self._get_user(request)
                     tag = get_object_or_404(Tag, name=self.tag_name)
                     user.hide_tag(tag)
                 def unhide(self, request):
                     """
                     Removed tag from user's hidden tags.
                     """
                     user = self._get_user(request)
                     tag = get_object_or_404(Tag, name=self.tag_name)
                     user.unhide_tag(tag)

boards/views/archived_threads.py

0 removed 0 -17

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages