From e09b28593fec3c0ff3ae3dda8eca089b30a2d7b0 Mon Sep 17 00:00:00 2001 From: philli Date: Mon, 18 Jan 2021 15:48:38 +0100 Subject: [PATCH] apps/userdashboard: add following page view, url, template and link from overview --- .../userdashboard_following.html | 18 ++++++++++++++++++ .../userdashboard_overview.html | 5 ++++- apps/userdashboard/urls.py | 3 +++ apps/userdashboard/views.py | 19 +++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_following.html diff --git a/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_following.html b/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_following.html new file mode 100644 index 000000000..1d3b57ed7 --- /dev/null +++ b/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_following.html @@ -0,0 +1,18 @@ +{% extends "a4_candy_userdashboard/base_userdashboard.html" %} +{% load i18n %} + +{% block dashboard_content %} + + + {% trans 'Back' %} + +

{% trans 'Following' %}

+
+ {% for project in view.projects %} +
+ {% include 'a4_candy_projects/includes/project_tile_userprofile.html' with project=project orientation='vertical' %} +
+ {% endfor %} +
+ +{% endblock %} diff --git a/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_overview.html b/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_overview.html index e785dd51a..9cbfa6ebc 100644 --- a/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_overview.html +++ b/apps/userdashboard/templates/a4_candy_userdashboard/userdashboard_overview.html @@ -12,6 +12,9 @@

{% trans 'Following' %}

{% empty %} {% trans 'This user is not active in any projects yet.' %} {% endfor %} +{% if view.projects.count > 9 %} + {% trans 'View more' %} +{% endif %} {% for action in view.actions|slice:":5" %} @@ -20,6 +23,6 @@

{% trans 'Following' %}

{% trans 'No activity yet. '%} {% endfor %} {% if view.actions.count > 5 %} - {% trans 'View more' %} + {% trans 'View more' %} {% endif %} {% endblock %} diff --git a/apps/userdashboard/urls.py b/apps/userdashboard/urls.py index 546f88830..33028ef04 100644 --- a/apps/userdashboard/urls.py +++ b/apps/userdashboard/urls.py @@ -12,4 +12,7 @@ url(r'^overview/activities/$', views.UserDashboardActivitiesView.as_view(), name='userdashboard-activities'), + url(r'^overview/following/$', + views.UserDashboardFollowingView.as_view(), + name='userdashboard-following'), ] diff --git a/apps/userdashboard/views.py b/apps/userdashboard/views.py index 530edf078..a2530b6e8 100644 --- a/apps/userdashboard/views.py +++ b/apps/userdashboard/views.py @@ -82,3 +82,22 @@ def actions(self): return Action.objects.filter( actor=self.request.user, ).exclude_updates() + + +class UserDashboardFollowingView(LoginRequiredMixin, + generic.base.ContextMixin, + generic.base.TemplateResponseMixin, + generic.base.View, + ): + + model = User + template_name = 'a4_candy_userdashboard/userdashboard_following.html' + + def get(self, request): + response = self.render_to_response(self.get_context_data()) + return response + + @property + def projects(self): + return Project.objects.filter(follow__creator=self.request.user, + follow__enabled=True)