From 768f2fd2a9fe2a1e6c90a7a9f47de7d8ece354ac Mon Sep 17 00:00:00 2001
From: Patrick <patrick@fet.at>
Date: Thu, 10 Dec 2020 23:59:39 +0000
Subject: [PATCH] change member url to unique id

---
 fet2020/members/urls.py                        |  2 +-
 fet2020/members/views.py                       |  8 ++++----
 fet2020/posts/views.py                         |  5 ++++-
 .../templates/members/partials/_member.html    |  2 +-
 fet2020/templates/posts/show.html              | 18 +++++++++++++-----
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py
index 16753f25..93c10b7a 100644
--- a/fet2020/members/urls.py
+++ b/fet2020/members/urls.py
@@ -9,7 +9,7 @@ urlpatterns = [
 ]
 
 member_urlpatterns = [
-    path('<str:member_name>', views.profile_view, name='member'),
+    path('<str:member_id>', views.profile_view, name='member'),
 ]
 
 jobs_urlpatterns = [
diff --git a/fet2020/members/views.py b/fet2020/members/views.py
index ae028d21..f8a575a0 100644
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -93,15 +93,15 @@ def members_view(request, filter=None):
     return render(request, 'members/index.html', context)
 
 
-def profile_view(request, member_name=None):
+def profile_view(request, member_id=None):
     pinned_job_groups, unpinned_job_groups = __get_job_groups()
 
-    member = Member.all_members.filter(nickname=member_name).first()
+    member = Member.all_members.filter(id=member_id).first()
     if not member:
-        logger.info("Wrong member name '{}'".format(member_name))
+        logger.info("Wrong member id '{}'".format(member_id))
         raise Http404("no member")
 
-    jobs = deque(JobMember.members.filter(member__nickname=member_name))
+    jobs = deque(JobMember.members.filter(member__id=member_id))
 
     context = {
         "pinned_job_groups": pinned_job_groups,
diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index eb5b7aba..73e5c8e1 100644
--- a/fet2020/posts/views.py
+++ b/fet2020/posts/views.py
@@ -64,11 +64,13 @@ def show(request, id=None):
     elif id != "" and id is not None:
         p = Post.objects.get(slug=(id))
 
-    post_author = Member.all_members.filter(nickname=p.author).first()
+    post_author = Member.all_members.filter(username=p.author).first()
     author_image = None
+    author = None
 
     if post_author:
         author_image = post_author.image['avatar'].url
+        author = post_author
 
     ep_agenda_link = "#"
     ep_protocol_link = "#"
@@ -89,6 +91,7 @@ def show(request, id=None):
 
     context = {
         "post": p,
+        "author": author,
         "author_image": author_image,
         "next": get_next_dict(p),
         "related_posts": p.tags.similar_objects()[:6],
diff --git a/fet2020/templates/members/partials/_member.html b/fet2020/templates/members/partials/_member.html
index 1ed9d65d..aa3101d2 100644
--- a/fet2020/templates/members/partials/_member.html
+++ b/fet2020/templates/members/partials/_member.html
@@ -1,5 +1,5 @@
 {# only thumb and name of member #}
-<a class="thumbnail member-thumb" href="{% url 'member' member.nickname %}" style="width:150px;height:150px">
+<a class="thumbnail member-thumb" href="{% url 'member' member.id %}" style="width:150px;height:150px">
     <img src="{{member.image.thumb.url}}" alt="" />
     <div class="thumb-layer">
         <div>
diff --git a/fet2020/templates/posts/show.html b/fet2020/templates/posts/show.html
index 4c7bf96b..6858eced 100644
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -26,15 +26,23 @@
             <div class="article-details">
                 {{ post.subtitle|default_if_none:"&nbsp;"|tags_to_url }}
 
-                {% if post.author %}
-                    <div class="article-author"><a href="{% url 'member' post.author %}">
-                    <img src="{{ author_image }}" alt="" /> {{ post.author }}
+                {% if author_image and author %}
+                    <div class="article-author">
+                    <a href="{% url 'member' author.id %}">
+                        <img src="{{ author_image }}" alt="" /> {{ author.firstname }}
+                    </a>
+                    </div>
+                {% elif post.author %}
+                    <div class="article-author">
+                    <a href="">
+                    <img src="" alt="" /> {{ post.author }}
                     </a>
                     </div>
                 {% else %}
-                    <div class="article-author"><a href="">
+                    <div class="article-author">
+                    <a href="">
                     <img src="" alt="" />
-                    {{ post.author }}</a>
+                    </a>
                     </div>
                 {% endif %}
             </div>