Annotation créée par {{ annotation.author.username }}

Titre : {{ annotation.current_revision.title }}

Description : {{ annotation.current_revision.description }}

{% if tags_data != "[]" %} @@ -83,7 +83,7 @@

{% if comment.allow_thread and user.is_authenticated %}

{% endif %} -

{{ comment.submit_date|date:"d/m/Y" }} à {{ comment.submit_date|time:"H:i" }} - {{comment.name}}

{% if comment.revision or comment.metacategories.count > 0 %} - {% endif %} {% if comment.revision %} diff -r 0a7ea508098a -r 287af0822445 src/iconolab/templates/iconolab/detail_annotation_readonly.html --- a/src/iconolab/templates/iconolab/detail_annotation_readonly.html Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/templates/iconolab/detail_annotation_readonly.html Mon Apr 17 13:31:59 2017 +0200 @@ -31,7 +31,7 @@

Annotation créée par {{ annotation.author.username }}

Titre : {{ annotation.current_revision.title }}

Description : {{ annotation.current_revision.description }}

{% if tags_data != "[]" %} diff -r 0a7ea508098a -r 287af0822445 src/iconolab/templates/iconolab/user_annotations.html --- a/src/iconolab/templates/iconolab/user_annotations.html Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/templates/iconolab/user_annotations.html Mon Apr 17 13:31:59 2017 +0200 @@ -21,35 +21,35 @@

Annotations par page :
- 5 + 5
- 10 + 10
- 25 + 25
- 100 + 100

{% if user_annotations.has_previous or user_annotations.has_next %}

- +
- {{page}} + {{page}}
- +

- Activité - Annotations diff -r 0a7ea508098a -r 287af0822445 src/iconolab/templates/iconolab/user_collection_admin.html --- a/src/iconolab/templates/iconolab/user_collection_admin.html Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/templates/iconolab/user_collection_admin.html Mon Apr 17 13:31:59 2017 +0200 @@ -9,7 +9,7 @@ {% load notifications_tags %} {% block content %} -

Tableau de bord - Fonds {{collection.verbose_name}}

Filtres et tri

diff -r 0a7ea508098a -r 287af0822445 src/iconolab/templates/iconolab/user_collections.html --- a/src/iconolab/templates/iconolab/user_collections.html Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/templates/iconolab/user_collections.html Mon Apr 17 13:31:59 2017 +0200 @@ -5,7 +5,7 @@ {% for collection in profile_user.profile.managed_collections.all %}

- Tableau de bord + Tableau de bord

{% endfor %} {% endblock %} diff -r 0a7ea508098a -r 287af0822445 src/iconolab/templates/iconolab/user_commented.html --- a/src/iconolab/templates/iconolab/user_commented.html Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/templates/iconolab/user_commented.html Mon Apr 17 13:31:59 2017 +0200 @@ -9,8 +9,8 @@ {% load notifications_tags %} {% block content %} -

{{profile_user.username}}: Annotations commentées Retour au profil

{% if not user_commented_annotations %}

Aucune annotation à afficher

@@ -23,36 +23,36 @@

Annotations par page :
- 5 + 5
- 10 + 10
- 25 + 25
- 100 + 100

{% if user_commented_annotations.has_previous or user_commented_annotations.has_next %}

- +
- {{page}} + {{page}}
- +

{{profile_user.username}}: Toutes les contributions Retour au profil

{% if not user_contributed_annotations %}

Aucune annotation à afficher

@@ -23,36 +23,36 @@

Annotations par page :
- 5 + 5
- 10 + 10
- 25 + 25
- 100 + 100

{% if user_contributed_annotations.has_previous or user_contributed_annotations.has_next %}

- +
- {{page}} + {{page}}
- +

- Voir toutes les annotations + Voir toutes les annotations {% endif %}

@@ -42,7 +42,7 @@ {% include "partials/user_pages/annotations_contributed_panel.html" with annotation_data=annotation_data user=profile_user %} {% endfor %}

- Voir toutes les contributions + Voir toutes les contributions

{% endif %} @@ -63,7 +63,7 @@ {% include "partials/user_pages/annotations_commented_panel.html" with annotation_data=annotation_data user=profile_user %} {% endfor %}

- Voir toutes les annotations commentées + Voir toutes les annotations commentées

{% endif %} diff -r 0a7ea508098a -r 287af0822445 src/iconolab/templates/partials/header.html --- a/src/iconolab/templates/partials/header.html Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/templates/partials/header.html Mon Apr 17 13:31:59 2017 +0200 @@ -21,7 +21,7 @@

+
Mon espace {{ unread_count }}

[a-z0-9\-]+)/images/(?P[^/]+)/annotations/(?P[^/]+)/revisions/(?P[^/]+)/detail', views.objects.ShowRevisionView.as_view(), name='revision_detail'), url(r'^collections/(?P[a-z0-9\-]+)/images/(?P[^/]+)/annotations/(?P[^/]+)/revisions/(?P[^/]+)/merge$', login_required(views.objects.MergeProposalView.as_view()), name='annotation_merge'), - url(r'^user/(?P[a-z0-9\-]+)/home/?$', views.userpages.UserHomeView.as_view(), name="user_home"), + url(r'^user/settings/?$', login_required(views.userpages.UserSettingsView.as_view()), name="user_settings"), + url(r'^user/collections/?$', login_required(views.userpages.UserCollectionsView.as_view()), name="user_collections"), + url(r'^user/notifications/', include(notifications.urls, namespace='notifications')), + url(r'^user/(?P[a-z0-9\-]+)/?$', views.userpages.UserHomeView.as_view(), name="user_home"), url(r'^user/(?P[a-z0-9\-]+)/commented/?$', views.userpages.UserCommentedView.as_view(), name="user_commented"), url(r'^user/(?P[a-z0-9\-]+)/contributed/?$', views.userpages.UserContributedView.as_view(), name="user_contributed"), url(r'^user/(?P[a-z0-9\-]+)/annotations/?$', views.userpages.UserAnnotationsView.as_view(), name="user_annotations"), - url(r'^user/(?P[a-z0-9\-]+)/adminpanel/(?P[a-z0-9\-]+)/$', views.userpages.UserCollectionAdminView.as_view(), name="user_admin_panel"), + url(r'^user/adminpanel/(?P[a-z0-9\-]+)/$', views.userpages.UserCollectionAdminView.as_view(), name="user_admin_panel"), url(r'^user/notifications/all/?$', login_required(views.userpages.UserNotificationsView.as_view()), name="user_notifications"), - url(r'^user/settings/?$', login_required(views.userpages.UserSettingsView.as_view()), name="user_settings"), - url(r'^user/collections/?$', login_required(views.userpages.UserCollectionsView.as_view()), name="user_collections"), - url(r'^user/notifications/', include(notifications.urls, namespace='notifications')), url(r'^errors/404', views.misc.NotFoundErrorView.as_view(), name="404error"), diff -r 0a7ea508098a -r 287af0822445 src/iconolab/views/userpages.py --- a/src/iconolab/views/userpages.py Mon Apr 17 12:39:55 2017 +0200 +++ b/src/iconolab/views/userpages.py Mon Apr 17 13:31:59 2017 +0200 @@ -22,7 +22,7 @@ latest annotations commented recap, also provides access to admin interface. """ model = User - slug_field = 'id' + slug_field = 'username' def get_context_data(self, **kwargs): context = super(UserHomeView, self).get_context_data(**kwargs) @@ -75,7 +75,7 @@ View that displays the full paginated list of annotations created for the considered user """ model = User - slug_field = 'id' + slug_field = 'username' def get_context_data(self, **kwargs): context = super(UserAnnotationsView, self).get_context_data(**kwargs) @@ -109,7 +109,7 @@ View that displays the full paginated list of annotations on which the considered user has commented """ model = User - slug_field = 'id' + slug_field = 'username' def get_context_data(self, **kwargs): context = super(UserCommentedView, self).get_context_data(**kwargs) @@ -137,7 +137,7 @@ View that displays the full paginated list of annotations on which the considered user has submitted at least one revision """ model = User - slug_field = 'id' + slug_field = 'username' def get_context_data(self, **kwargs): context = super(UserContributedView, self).get_context_data(**kwargs) @@ -160,21 +160,22 @@ context['profile_user'] = profile_user return render(request, 'iconolab/user_contributed.html', context) -class UserCollectionAdminView(DetailView): +class UserCollectionAdminView(View): """ View that displays the admin panel, allowing collection admin to filter and order annotations on several criterias """ - model = User - slug_field = 'id' + # model = User + # slug_field = 'id' - def get_context_data(self, **kwargs): - context = super(UserCollectionAdminView, self).get_context_data(**kwargs) - return context + # def get_context_data(self, **kwargs): + # context = super(UserCollectionAdminView, self).get_context_data(**kwargs) + # return context def get(self, request, *args, **kwargs): - self.object = self.get_object() - profile_user = self.object - context = self.get_context_data() + # self.object = self.get_object() + profile_user = request.user + # context = self.get_context_data() + context = {} collection_name = kwargs.get("collection_name") collection_qs = Collection.objects.filter(name=collection_name) if not request.user.is_staff and not request.user.is_authenticated or profile_user != request.user or not collection_qs.exists():