Merge lp:~widelands-dev/widelands-website/more_latest_posts into lp:widelands-website

[kaputtnik]

Add a 'more latest posts view'

Add a view to show more 'latest posts'

- Add a link to the bottom of the 'Latest Posts' box
- Add a view showing the latest posts
- Add a form to adjust the days and the sort option: by topic/forum
- Increased number for the 'Last Post' box to have more last posts in it if too many posts are created in one topic.
- fixed url parsing after login: A url with a query string like '.../?page=3#post-27347' does not work after login. Now it works.

I have merged it on alpha for testing: http://alpha.widelands.org/forum/latest_posts/?days=365&sort_by=topic

[GunChleoc (gunchleoc)]

Added some nits for strings and comments.

The grouping doesn't work properly. In

http://alpha.widelands.org/forum/latest_posts/?days=400&sort_by=forum

I see the "Germany" forum twice and the topic "Na dann gucken wir mal wie das hier ist" 3 times.

In http://alpha.widelands.org/forum/latest_posts/?days=400&sort_by=topic, I see the same topic listed multiple times as well.

[kaputtnik (franku)]

Thanks. I have replied to one of your inline comments below.

About grouping: I agree that this can be confusing. Currently the list is always sorted by the posts dates, so grouping lead into this situation were some topics appear double. Say we have:

post1 created 12.3.2019 in topic foo
post2 created 11.3.2019 in topic bar
post3 created 10.3.2019 in topic baz
post4 created 1.1.2019 in topic foo

Will lead to:

topic foo:
 post1 (12.3.2019)

topic bar:
 post2 (11.3.1019)

topic baz:
 post3 (10.3.2019)

topic foo:
 post4 (1.1.2019)

If we change this to something like:

topic foo:
 post1 (12.3.2019)
 post4 (1.1.2019)

topic bar:
 post2 (11.3.1019)

topic baz:
 post3 (10.3.2019)

The posts are not sorted by date anymore: A post created yesterday may appear at the bottom of the page then, after several other old posts.

I am unsure about a good grouping. Maybe this should be tested in production to have real time data? Or adding a third option 'no grouping' which shows the posts by date descending and change the grouping by topic/forum to have no double entries?

[GunChleoc (gunchleoc)]

The change you mention is exactly what I would expect. Sorted by topics' last post date rather than each individual post's date.

The only reason we need this long list really is that we can't link to the first unread post.

[lp:~widelands-dev/widelands-website/more_latest_posts]

539. By kaputtnik on 2019-03-19

stringfixes

[kaputtnik (franku)]

Done with stringfixes, also applied the change to the label of days as you suggested.

Will apply the needed changes to have the ordering/grouping you mentioned. This may take some time so i shut down alpha again.

[lp:~widelands-dev/widelands-website/more_latest_posts]

540. By kaputtnik on 2019-03-20

rework of grouping algorithm

541. By kaputtnik on 2019-03-20

cleanups

[kaputtnik (franku)]

Ok, all done, please revisit alpha: http://alpha.widelands.org/forum/latest_posts/?days=400&sort_by=forum

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

Perfect, let's have it :)

review: Approve

[kaputtnik (franku)]

Thanks :-)

Merged and deployed.

=== modified file 'mainpage/templates/mainpage/header.html'
--- mainpage/templates/mainpage/header.html	2019-03-03 15:17:58 +0000
+++ mainpage/templates/mainpage/header.html	2019-03-20 21:32:45 +0000
@@ -42,7 +42,7 @@
 			<br />
 			<a href="{% url 'logout' %}?next=/">Logout</a>
 		{% else %}
-			<a href="{% url 'login' %}?next={{ request.path|iriencode }}">Login/Register</a>
+			<a href="{% url 'login' %}?next={{ request.get_full_path|urlencode }}">Login/Register</a>
 		{% endif %}
 	</li>
 </ul>
 
=== modified file 'pybb/forms.py'
--- pybb/forms.py	2018-12-21 11:26:08 +0000
+++ pybb/forms.py	2019-03-20 21:32:45 +0000
@@ -87,3 +87,15 @@
         post.updated = datetime.now()
         post.save(*args, **kwargs)
         return post
+
+
+class LastPostsDayForm(forms.Form):
+    days = forms.IntegerField(
+        max_value = 1000,
+        min_value = 5,
+        )
+    
+    sort_by = forms.ChoiceField(
+        choices = [('forum','Forum'),('topic', 'Topic'),],
+        label = 'Group by:',
+        )
 
=== modified file 'pybb/settings.py'
--- pybb/settings.py	2018-12-21 12:50:32 +0000
+++ pybb/settings.py	2019-03-20 21:32:45 +0000
@@ -18,6 +18,7 @@
 ATTACHMENT_SIZE_LIMIT = get('PYBB_ATTACHMENT_SIZE_LIMIT', 1024 * 1024)
 ATTACHMENT_ENABLE = get('PYBB_ATTACHMENT_ENABLE', True)
 INTERNAL_PERM =  get('INTERNAL_PERM', 'pybb.can_access_internal')
+LAST_POSTS_DAYS = get('LAST_POSTS_DAYS', 30)
 
 # That is used internally
 DISABLE_NOTIFICATION = False
 
=== added file 'pybb/templates/pybb/all_last_posts.html'
--- pybb/templates/pybb/all_last_posts.html	1970-01-01 00:00:00 +0000
+++ pybb/templates/pybb/all_last_posts.html	2019-03-20 21:32:45 +0000
@@ -0,0 +1,73 @@
+{% extends 'pybb/base.html' %}
+
+{% block title %}
+    Latest posts - {{ block.super }}
+{% endblock title %}
+
+{% block content_header %}
+    <h1>Latest Posts</h1>
+{% endblock %}
+
+{% block content_main %}
+<div class="blogEntry">
+  <form action="." method="post" novalidate>
+  {% csrf_token %}
+  <span class="errormessage">{{ form.days.errors }}</span>
+  <label for="id_days">Show posts created up to
+  {{ form.days }} days ago. </label>
+  <span class="errormessage">{{ form.sort_by.errors }}</span>
+  {{ form.sort_by.label_tag }} {{ form.sort_by }}
+  <input type="submit" value="Submit" />
+  {% if form.errors %}
+    <p class="errormessage">
+      An error occured, some default values are used.
+      Please correct the errors above to get valuable results.
+    </p>
+  {% else %}
+    <p>
+      Found {{ posts_count }} posts. The list is always sorted by the most recent post first.
+    </p>
+  {% endif %}
+  </form>
+
+    <hr>
+
+{% if sort_by == 'topic' %}
+  {% for topic, posts in object_list.items %}
+    <h2>Topic: {{ topic }}</h2>
+    <p>
+      At Forum:
+      <a href="{% url 'pybb_forum' topic.forum.id %}">{{ topic.forum }}</a>
+    </p>
+    {% include 'pybb/inlines/latest_posts_table.html'%}
+  {% endfor %}
+
+{% else %} {# sort by forum #}
+  {% for forum, topics in object_list.items %}
+    <h2>Forum: {{ forum }}</h2>
+    <table class='forum'>
+      <thead>
+        <tr>
+          <th style="text-align: left; width: 30%;">Topic{{ topic_list|length|pluralize }}</th>
+          <th style="text-align: left;">Post{{ posts|length|pluralize }}</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for topic, posts in topics.items %}
+          <tr class={% cycle 'odd' 'even' %}>
+            <td class='post'>
+              <a href="{% url 'pybb_topic' topic.id %}">{{ topic }}</a>
+            </td>
+            <td>
+              {% include 'pybb/inlines/latest_posts_table.html'%}
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  {% empty %}
+    <p>Sorry, no posts found...</p>
+  {% endfor %}
+{% endif %}
+</div>
+{% endblock %}
 
=== added file 'pybb/templates/pybb/inlines/latest_posts_table.html'
--- pybb/templates/pybb/inlines/latest_posts_table.html	1970-01-01 00:00:00 +0000
+++ pybb/templates/pybb/inlines/latest_posts_table.html	2019-03-20 21:32:45 +0000
@@ -0,0 +1,21 @@
+{% load custom_date %}
+{% load wlprofile_extras %}
+
+<table class='forum'>
+  <thead>
+    <tr>
+      <th style="text-align: left; width: 20%;">Date</th>
+      <th style="text-align: left; width: 20%;">User</th>
+      <th style="text-align: left;">Post{{posts|length|pluralize}}</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for post in posts %}
+    <tr class="{% cycle 'odd' 'even' %}">
+      <td class='post'>{{ post.created|custom_date:user }}</td>
+      <td class='post'>{{ post.user|user_link }}</td>
+      <td class='post'><a href="{{post.get_absolute_url}}">"{{ post.body_text|truncatechars:80}}"</a></td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
 
=== modified file 'pybb/templates/pybb/last_posts.html'
--- pybb/templates/pybb/last_posts.html	2018-12-10 16:37:12 +0000
+++ pybb/templates/pybb/last_posts.html	2019-03-20 21:32:45 +0000
@@ -15,6 +15,9 @@
 					by {{ post.user|user_link }} {{ post.created|minutes }} ago
 				</li>
 			{% endfor %}
+			<li class="small">
+				<a href="{% url 'all_latest_posts' %}">More latest posts</a>
+			</li>
 		</ul>
 	</div>
 </div>
 
=== modified file 'pybb/templatetags/pybb_extras.py'
--- pybb/templatetags/pybb_extras.py	2019-02-27 17:20:01 +0000
+++ pybb/templatetags/pybb_extras.py	2019-03-20 21:32:45 +0000
@@ -20,15 +20,18 @@
 
 @register.inclusion_tag('pybb/last_posts.html', takes_context=True)
 def pybb_last_posts(context, number=8):
+
+    # Create a Queryset
+    last_posts = Post.objects.all().order_by(
+            '-created')
+
+    # Permission dependent Queryset filtering
     if pybb.views.allowed_for(context.request.user):
-        last_posts = Post.objects.filter(
-            hidden=False).order_by(
-            '-created')[:45]
+        last_posts = last_posts.filter(
+            hidden=False)[:100]
     else:
-        last_posts = Post.objects.filter(
-            hidden=False, topic__forum__category__internal=False).order_by(
-            '-created')[:45]
-            
+        last_posts = last_posts.filter(
+            hidden=False, topic__forum__category__internal=False)[:100]
 
     check = []
     answer = []
@@ -39,7 +42,7 @@
                 answer = answer + [post]
     return {
         'posts': answer,
-    }
+        }
 
 
 @register.simple_tag
 
=== modified file 'pybb/urls.py'
--- pybb/urls.py	2018-12-21 09:50:32 +0000
+++ pybb/urls.py	2019-03-20 21:32:45 +0000
@@ -40,6 +40,7 @@
     url('^post/(?P<post_id>\d+)/edit/$', views.edit_post, name='pybb_edit_post'),
     url('^post/(?P<post_id>\d+)/delete/$',
         views.delete_post, name='pybb_delete_post'),
+    url(r'^latest_posts/$', views.all_latest, name='all_latest_posts'),
 
     # Attachment
     url('^attachment/(?P<hash>\w+)/$',
 
=== modified file 'pybb/views.py'
--- pybb/views.py	2019-03-04 17:47:12 +0000
+++ pybb/views.py	2019-03-20 21:32:45 +0000
@@ -1,4 +1,5 @@
 import math
+from collections import OrderedDict
 from mainpage.templatetags.wl_markdown import do_wl_markdown
 from pybb.markups import mypostmarkup
 
@@ -14,12 +15,14 @@
 from pybb.util import render_to, build_form, quote_text, ajax, urlize
 from pybb.models import Category, Forum, Topic, Post, Attachment,\
     MARKUP_CHOICES
-from pybb.forms import AddPostForm, EditPostForm
+from pybb.forms import AddPostForm, EditPostForm, LastPostsDayForm
 from pybb import settings as pybb_settings
 from pybb.orm import load_related
 from pybb.templatetags.pybb_extras import pybb_moderated_by
 
 from check_input.models import SuspiciousInput
+from datetime import date, timedelta
+
 
 try:
     from notification import models as notification
@@ -387,3 +390,97 @@
     first_post.save()
     
     return redirect(topic)
+
+
+def all_latest_posts(request):
+    """Provide a view to show more latest posts."""
+
+    # default values
+    sort_by_default = 'topic'
+    days_default = pybb_settings.LAST_POSTS_DAYS
+
+    if request.method == 'POST':
+        # Executed when the form is submitted
+        form = LastPostsDayForm(request.POST)
+        if form.is_valid():
+            days = form.cleaned_data['days']
+            sort_by = form.cleaned_data['sort_by']
+            url = '{}?days={days}&sort_by={sort_by}'.format(
+                reverse('all_latest_posts'),
+                days=days, sort_by=sort_by
+                )
+
+            return HttpResponseRedirect(url)
+
+    else: # request GET
+        # Initialize if no values are given or if the
+        # values are given in the url
+        days = request.GET.get('days', days_default)
+        sort_by = request.GET.get('sort_by', sort_by_default)
+
+        # Create a bound form, so error messages are shown if
+        # the given values don't validate against the form
+        form = LastPostsDayForm(
+            {
+                'days': days,
+                'sort_by': sort_by,
+            }
+            )
+
+        if not form.is_valid():
+            # If we are here, the user has likely modified the query in the url
+            # with invalid values and we apply defaults for the database query
+            days = days_default
+            sort_by = sort_by_default
+
+    # Executed on every request (POST and GET)
+    search_date = date.today() - timedelta(int(days))
+
+    # Create a QuerySet ordered by date
+    last_posts = Post.objects.filter(
+        created__gte=search_date,
+        hidden=False,
+        topic__forum__category__internal=False
+        ).order_by('-created')
+
+    # Exclude hidden topics. After this operation last_posts isn't a
+    # type of QuerySet anymore and django queries will not work
+    last_posts = [p for p in last_posts if not p.topic.is_hidden]
+
+    posts_count = len(last_posts)
+
+    if sort_by == 'topic':
+        # The use of an OrderedDict makes sure the ordering of
+        # last_posts get not arbitrary
+        topics = OrderedDict()
+        for post in last_posts:
+            if post.topic not in topics:
+                # Create a new key with a list as value
+                topics[post.topic] = [post]
+            else:
+                # key exists, just add the post
+                topics[post.topic].append(post)
+
+        object_list = topics
+
+    elif sort_by == 'forum':
+        forums = OrderedDict()
+        for post in last_posts:
+            if post.topic.forum.name not in forums:
+                forums[post.topic.forum.name] = OrderedDict({post.topic: [post]})
+            elif post.topic not in forums[post.topic.forum.name]:
+                forums[post.topic.forum.name].update({post.topic: [post]})
+            else:
+                forums[post.topic.forum.name][post.topic].append(post)
+
+        object_list = forums
+
+    return {
+        'object_list': object_list,
+        'posts_count': posts_count,
+        'form': form,
+        'sort_by': sort_by
+    }
+
+
+all_latest = render_to('pybb/all_last_posts.html')(all_latest_posts)