fix some merge errors

2020-08-29 12:00:58 +00:00
parent beec3bf3e7
commit 04e7bb911b
5 changed files with 7 additions and 35 deletions
--- a/fet2020/templates/posts/show.html
+++ b/fet2020/templates/posts/show.html
@@ -16,10 +16,8 @@
          <div class="article-details">
          {{post.subtitle | tags_to_url }}
          {% if post.username != None %}
-            <div class="arti
-              <img src="{{post.username.image | thumbnail_url:'avatar'}}" alt="" />
-              <a href="{% url 'member' post.username.nickname %}">{{post.username.nickname}}</a>
-              <img src="{{author_image}}" alt="" />
+            <div class="article-author">
+              <img src="{{post.author.image | thumbnail_url:'avatar'}}" alt="" />
              <a href="/members/member/{{post.author}}">{{post.author}}</a>

            </div>