u/bodqhrohro/swineboard Commit - r1469:a16adec6

Added ability to open fav posts as a feed with parameter

neko259 -

r1469:a16adec6 default

parent child

boards/templates/boards/base.html

0 +1 -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 'css/3party/highlight.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static 'css/3party/jquery-ui.min.css' %}" media="all"/>
                 <link rel="stylesheet" type="text/css" href="{% static theme_css %}" media="all"/>
                 {% if rss_url %}
                     <link rel="alternate" type="application/rss+xml" href="{{ rss_url }}" title="{% trans 'Feed' %}"/>
                 {% endif %}
                 <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 data-image-viewer="{{ image_viewer }}"
                   data-pow-difficulty="{{ pow_difficulty }}"
                   data-update-script="{% static 'js/updates.js' %}">
                 <script src="{% static 'js/jquery-2.0.1.min.js' %}"></script>
                 <div class="navigation_panel header">
                     <a class="link" href="{% url 'index' %}">{% trans "All threads" %}</a>
                     {% if tags_str %}
                         {% autoescape off %}
                             {{ tags_str }},
                         {% endautoescape %}
                     {% else %}
                         {% trans 'Add tags' %} →
                     {% endif %}
                     <a href="{% url 'tags' 'required'%}" title="{% trans 'Tag management' %}">{% trans "tags" %}</a>,
                     <a href="{% url 'search' %}" title="{% trans 'Search' %}">{% trans 'search' %}</a>,
                     <a href="{% url 'feed' %}" title="{% trans 'Feed' %}">{% trans 'feed' %}</a>,
                     <a href="{% url 'random' %}" title="{% trans 'Random images' %}">{% trans 'random' %}</a>{% if has_fav_threads %},
-                    <a href="#" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count" {% if not new_post_count %}style="display: none" {% endif %}>{{ new_post_count }}</span></a>
+                    <a href="{% url 'feed' %}?favorites" id="fav-panel-btn">{% trans 'favorites' %} <span id="new-fav-post-count" {% if not new_post_count %}style="display: none" {% endif %}>{{ new_post_count }}</span></a>
                     {% endif %}
                     {% if usernames %}
                         <a class="right-link link" href="{% url 'notifications' %}" title="{% trans 'Notifications' %}">
                             {% trans 'Notifications' %}
                             {% ifnotequal new_notifications_count 0 %}
                                 (<b>{{ new_notifications_count }}</b>)
                             {% endifnotequal %}
                         </a>
                     {% endif %}
                     <a class="right-link link" href="{% url 'settings' %}">{% trans 'Settings' %}</a>
                 </div>
                 <div id="fav-panel"><div class="post">{% trans "Loading..." %}</div></div>
                 {% block content %}{% endblock %}
                 <script src="{% static 'js/3party/jquery-ui.min.js' %}"></script>
                 <script src="{% static 'js/jquery.mousewheel.js' %}"></script>
                 <script src="{% static 'js/3party/highlight.min.js' %}"></script>
                 <script src="{% url 'js_info_dict' %}"></script>
                 <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 footer">
                     {% block metapanel %}{% endblock %}
                     {% if rss_url %}
                         [<a href="{{ rss_url }}">RSS</a>]
                     {% endif %}
                     [<a href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>]
                     [<a href="{% url 'index' %}?order=pub">{% trans 'New threads' %}</a>]
                     {% with ppd=posts_per_day|floatformat:2 %}
                         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
                     {% endwith %}
                     <a class="link" href="#top" id="up">{% trans 'Up' %}</a>
                 </div>
             </body>
             </html>

boards/views/feed.py

0 +5 -6

             from django.core.urlresolvers import reverse
             from django.shortcuts import render
             from boards.abstracts.paginator import get_paginator
             from boards.abstracts.settingsmanager import get_settings_manager
             from boards.models import Post
             from boards.views.base import BaseBoardView
             from boards.views.posting_mixin import PostMixin
             POSTS_PER_PAGE = 10
             PARAMETER_CURRENT_PAGE = 'current_page'
             PARAMETER_PAGINATOR = 'paginator'
             PARAMETER_POSTS = 'posts'
-            PARAMETER_ADDITONAL_ATTRS = 'additional_attrs'
             PARAMETER_PREV_LINK = 'prev_page_link'
             PARAMETER_NEXT_LINK = 'next_page_link'
             TEMPLATE = 'boards/feed.html'
             DEFAULT_PAGE = 1
             class FeedView(PostMixin, BaseBoardView):
                 def get(self, request):
                     page = request.GET.get('page', DEFAULT_PAGE)
                     tripcode = request.GET.get('tripcode', None)
+                    favorites = 'favorites' in request.GET
                     params = self.get_context_data(request=request)
                     settings_manager = get_settings_manager(request)
                     posts = Post.objects.exclude(
                         threads__tags__in=settings_manager.get_hidden_tags()).order_by(
                         '-pub_time').prefetch_related('images', 'thread', 'threads')
                     if tripcode:
                         posts = posts.filter(tripcode=tripcode)
+                    if favorites:
+                        fav_thread_ops = Post.objects.filter(id__in=settings_manager.get_fav_threads().keys())
+                        fav_threads = [op.get_thread() for op in fav_thread_ops]
+                        posts = posts.filter(threads__in=fav_threads)
                     paginator = get_paginator(posts, POSTS_PER_PAGE)
                     paginator.current_page = int(page)
                     params[PARAMETER_POSTS] = paginator.page(page).object_list
-                    additional_params = dict()
-                    if tripcode:
-                        additional_params['tripcode'] = tripcode
-                        params[PARAMETER_ADDITONAL_ATTRS] = '&tripcode=' + tripcode
                     paginator.set_url(reverse('feed'), request.GET.dict())
                     self.get_page_context(paginator, params, page)
                     return render(request, TEMPLATE, params)
                 # TODO Dedup this into PagedMixin
                 def get_page_context(self, paginator, params, page):
                     """
                     Get pagination context variables
                     """
                     params[PARAMETER_PAGINATOR] = paginator
                     current_page = paginator.page(int(page))
                     params[PARAMETER_CURRENT_PAGE] = current_page
                     if current_page.has_previous():
                         params[PARAMETER_PREV_LINK] = paginator.get_page_url(
                                 current_page.previous_page_number())
                     if current_page.has_next():
                         params[PARAMETER_NEXT_LINK] = paginator.get_page_url(
                                 current_page.next_page_number())

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