- {% if user.is_authenticated %}
- - {{user.username}}: Mon espace
+ {% if request.user.is_authenticated %}
+ - {{user.username}}: Mon espace
- Se déconnecter
{% else %}
- Créer un compte
diff -r 09b2da30cd93 -r f747c112e8f4 src/iconolab/templates/partials/image_annotations_list.html
--- a/src/iconolab/templates/partials/image_annotations_list.html Tue Aug 02 11:13:52 2016 +0200
+++ b/src/iconolab/templates/partials/image_annotations_list.html Wed Aug 03 15:47:03 2016 +0200
@@ -38,8 +38,8 @@
{{ annotation.created|date:'d-m-Y' }} |
{{ annotation.current_revision.created|date:'d-m-Y' }} |
- {% for contributor in annotation.stats.contributors %}
- {{ contributor }}{% if not forloop.last %}, {% endif %}
+ {% for contributor in annotation.stats.contributors.all %}
+ {{ contributor.username }}{% if not forloop.last %}, {% endif %}
{% endfor %}
|
diff -r 09b2da30cd93 -r f747c112e8f4 src/iconolab/urls.py
--- a/src/iconolab/urls.py Tue Aug 02 11:13:52 2016 +0200
+++ b/src/iconolab/urls.py Wed Aug 03 15:47:03 2016 +0200
@@ -22,6 +22,7 @@
from django.conf.urls.static import static
from django.contrib.auth.decorators import login_required
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+import notifications.urls
urlpatterns = [
url(r'^$', views.iconolab.RedirectView.as_view(url=reverse_lazy("home"))),
@@ -35,12 +36,13 @@
url(r'^collections/(?P[a-z]+)/images/(?P[^/]+)/annotations/(?P[^/]+)/edit$', login_required(views.iconolab.EditAnnotationView.as_view()), name='annotation_edit'),
url(r'^collections/(?P[a-z]+)/images/(?P[^/]+)/annotations/(?P[^/]+)/revisions/(?P[^/]+)/detail', views.iconolab.ShowRevisionView.as_view(), name='revision_detail'),
url(r'^collections/(?P[a-z]+)/images/(?P[^/]+)/annotations/(?P[^/]+)/revisions/(?P[^/]+)/merge$', login_required(views.iconolab.MergeProposalView.as_view()), name='annotation_merge'),
- url(r'^user/profile', login_required(views.iconolab.UserProfileView.as_view()), name="user_profile"),
+ url(r'^user/(?P[a-z0-9\-]+)/home/', views.iconolab.UserHomeView.as_view(), name="user_home"),
url(r'^errors/404', views.iconolab.NotFoundErrorView.as_view(), name="404error"),
url(r'^rest', include('restapi.urls')),
url(r'^account/', include('iconolab.auth.urls', namespace='account')),
url(r'^comments/', include('django_comments_xtd.urls')),
- url(r'^comments/annotation/post', views.comments.post_comment_iconolab, name="post_comment")
+ url(r'^comments/annotation/post', views.comments.post_comment_iconolab, name="post_comment"),
+ url('^user/notifications/', include(notifications.urls, namespace='notifications')),
]
urlpatterns += staticfiles_urlpatterns()
diff -r 09b2da30cd93 -r f747c112e8f4 src/iconolab/views/comments.py
--- a/src/iconolab/views/comments.py Tue Aug 02 11:13:52 2016 +0200
+++ b/src/iconolab/views/comments.py Wed Aug 03 15:47:03 2016 +0200
@@ -7,6 +7,7 @@
from django_comments import signals
from django_comments.views.utils import next_redirect, confirmation_view
from django_comments.views.comments import CommentPostBadRequest
+from iconolab.models import MetaCategoryInfo
@csrf_protect
@require_POST
diff -r 09b2da30cd93 -r f747c112e8f4 src/iconolab/views/iconolab.py
--- a/src/iconolab/views/iconolab.py Tue Aug 02 11:13:52 2016 +0200
+++ b/src/iconolab/views/iconolab.py Wed Aug 03 15:47:03 2016 +0200
@@ -1,7 +1,8 @@
from django.shortcuts import HttpResponse, get_object_or_404, render
from django.http import Http404
from django.contrib.auth.decorators import login_required
-from django.views.generic import View, RedirectView
+from django.contrib.auth.models import User
+from django.views.generic import View, DetailView, RedirectView
from django.views.generic.base import ContextMixin
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.core.urlresolvers import reverse
@@ -9,6 +10,7 @@
from django.contrib.contenttypes.models import ContentType
from django.contrib.sites.models import Site
from django.conf import settings
+from notifications.models import Notification
from iconolab.models import Annotation, AnnotationRevision, Collection, Item, Image, IconolabComment, MetaCategory, MetaCategoryInfo
from iconolab.forms.annotations import AnnotationRevisionForm
@@ -20,10 +22,39 @@
return render(request, 'iconolab/home.html', context)
-class UserProfileView(View):
+class UserHomeView(DetailView):
+ model = User
+ slug_field = "id"
+
+ def get_context_data(self, **kwargs):
+ context = super(UserHomeView, self).get_context_data(**kwargs)
+ return context
+
def get(self, request, *args, **kwargs):
- context = {}
- return render(request, 'iconolab/user_page.html', context)
+ self.object = self.get_object()
+ context = self.get_context_data()
+ profile_user = self.object
+ context["profile_user"] = profile_user
+ context["user_annotations"] = Annotation.objects.filter(author=profile_user).prefetch_related(
+ "current_revision",
+ "revisions",
+ "image",
+ "image__item",
+ "image__item__collection"
+ )
+ context["user_revisions_annotations"] = Annotation.objects.filter(revisions__author=profile_user).exclude(author=profile_user).prefetch_related(
+ "current_revision",
+ "revisions",
+ "image",
+ "image__item",
+ "image__item__collection"
+ ).distinct()
+ comments_annotations_str_id = IconolabComment.objects.filter(user=profile_user, content_type__app_label="iconolab", content_type__model="annotation").values_list("object_pk", flat=True)
+ comments_annotations_id = [int(str_id) for str_id in comments_annotations_str_id]
+ context["user_comments_annotations"] = Annotation.objects.filter(id__in=comments_annotations_id).exclude(author=profile_user).distinct()
+ if request.user.is_authenticated() and self.object == request.user:
+ context["notifications"] = Notification.objects.filter(recipient=request.user)
+ return render(request, 'iconolab/user_home.html', context)
class CollectionHomepageView(View, ContextMixin):
|
+ + + {% endthumbnail %} +
++