Merge branch 'Development'

Joeriksson · Jan 4, 2020 · 2044d0e · 2044d0e
2 parents 9a7d662 + 27e647c
commit 2044d0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/templates/_base.html b/templates/_base.html
@@ -40,7 +40,7 @@
                         <div class="dropdown-menu dropdown-menu-right " aria-labelledby="userMenu">
                             <a class="dropdown-item" href="{% url 'account_change_password' %}">Change password</a>
                             <div class="dropdown-divider"></div>
-                            <a class="dropdown-item" href="{% url 'user_profile_edit' request.user.id %}">Edit profile</a>
+                            <a class="dropdown-item" href="{% url 'user_profile_edit' request.user.profile.id %}">Edit profile</a>
                             <div class="dropdown-divider"></div>
                             <a class="dropdown-item" href="{% url 'account_logout' %}">Log out</a>
                         </div>

diff --git a/templates/forums/forum_list.html b/templates/forums/forum_list.html
@@ -33,7 +33,7 @@ <h3>{{ forum.title }}</h3>
                         <i>{{ forum.description }}</i>
                     </div>
                     <p class="p-3 font-weight-lighter"><small>number of
-                        threads: {{ forum.thread_set.all.count }}</small></p>
+                        threads: {{ forum.threads.all.count }}</small></p>
 
                 </a>