Fixed #409

misago/forums/models.py

@@ -110,11 +110,11 @@ class Forum(MPTTModel):
     def get_absolute_url(self):
         if not self.special_role:
             if self.level == 1:
-                formats = (reverse('misago:index'), self.slug, self.pk)
+                formats = (reverse('misago:index'), self.slug, self.id)
                 return '%s#%s-%s' % formats
             else:
                 return reverse('misago:%s' % self.role, kwargs={
-                    'forum_id': self.pk, 'forum_slug': self.slug
+                    'forum_id': self.id, 'forum_slug': self.slug
                 })
         else:
             return None

misago/templates/misago/admin/users/list.html

@@ -30,12 +30,12 @@
 
 {% block table-row %}
 <td>
-  <a href="{% url USER_PROFILE_URL user_slug=item.slug user_id=item.pk %}">
+  <a href="{% url USER_PROFILE_URL user_slug=item.slug user_id=item.id %}">
     <img src="{{ item|avatar:24 }}" alt="{% trans "Avatar" %}" width="24" height="24">
   </a>
 </td>
 <td class="item-name {% if item.requires_activation %}text-muted{% endif %}">
-  <a href="{% url USER_PROFILE_URL user_slug=item.slug user_id=item.pk %}">{{ item.username }}</a>
+  <a href="{% url USER_PROFILE_URL user_slug=item.slug user_id=item.id %}">{{ item.username }}</a>
 </td>
 <td class="lead text-muted">
   {% if item.requires_activation_by_admin %}
@@ -77,7 +77,7 @@
 </td>
 {% endfor %}
 <td class="row-action">
-  <a href="{% url 'misago:admin:users:accounts:edit' user_id=item.pk %}" class="btn btn-primary tooltip-top" title="{% trans "Edit user" %}">
+  <a href="{% url 'misago:admin:users:accounts:edit' user_id=item.id %}" class="btn btn-primary tooltip-top" title="{% trans "Edit user" %}">
     <span class="fa fa-pencil"></span>
   </a>
 </td>

misago/templates/misago/emails/activation/by_user.html

@@ -8,6 +8,6 @@
 {% endblocktrans %}
 <br>
 <br>
-<a href="{{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.pk token=activation_token %}">{% trans "Activate my account!" %}</a>
+<a href="{{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.id token=activation_token %}">{% trans "Activate my account!" %}</a>
 <br>
 {% endblock content %}

misago/templates/misago/emails/activation/by_user.txt

@@ -6,5 +6,5 @@
 {% blocktrans trimmed with user=recipient.username %}
 {{ user }}, to activate your account click the below link:
 {% endblocktrans %}
-{{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.pk token=activation_token %}"
+{{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.id token=activation_token %}"
 {% endblock content %}

misago/templates/misago/emails/change_password_form_link.html

@@ -13,6 +13,6 @@ To change your account password click the link below:
 {% endblocktrans %}
 <br>
 <br>
-<a href="{{ SITE_ADDRESS }}{% url 'misago:reset_password_form' user_id=recipient.pk token=confirmation_token %}">{% trans "Set new password" %}</a>
+<a href="{{ SITE_ADDRESS }}{% url 'misago:reset_password_form' user_id=recipient.id token=confirmation_token %}">{% trans "Set new password" %}</a>
 <br>
 {% endblock content %}

misago/templates/misago/emails/change_password_form_link.txt

@@ -10,5 +10,5 @@
 {% blocktrans trimmed %}
 To change your account password click the link below:
 {% endblocktrans %}
-{{ SITE_ADDRESS }}{% url 'misago:reset_password_form' user_id=recipient.pk token=confirmation_token %}
+{{ SITE_ADDRESS }}{% url 'misago:reset_password_form' user_id=recipient.id token=confirmation_token %}
 {% endblock content %}

misago/templates/misago/emails/register/inactive.html

@@ -24,7 +24,7 @@
   {% endblocktrans %}
   <br>
   <br>
-  <a href="{{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.pk token=activation_token %}">{% trans "Activate my account!" %}</a>
+  <a href="{{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.if token=activation_token %}">{% trans "Activate my account!" %}</a>
   <br>
   <br>
   {% capture trimmed as login_link %}

misago/templates/misago/emails/register/inactive.txt

@@ -25,7 +25,7 @@
   {% blocktrans trimmed %}
   Before you will be able to join discussion on our forums, you have to activate your account. To do so, simply click the link below:
   {% endblocktrans %}
-  {{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.pk token=activation_token %}"
+  {{ SITE_ADDRESS }}{% url 'misago:activate_by_token' user_id=recipient.id token=activation_token %}"
 
   {% blocktrans trimmed with login_form=login_link|safe %}
   Once your account is activated, you can always sign in to it using the form velow:

misago/templates/misago/modusers/base.html

@@ -9,7 +9,7 @@
     <h1>
       <div class="main">
         <img src="{{ profile|avatar:20 }}" alt="{% trans "Avatar" %}">
-        <a href="{% url USER_PROFILE_URL user_slug=profile.slug user_id=profile.pk %}">
+        <a href="{% url USER_PROFILE_URL user_slug=profile.slug user_id=profile.id %}">
           {{ profile.username }}
         </a>
       </div>

misago/templates/misago/profile/side.html

@@ -13,7 +13,7 @@
 <ul class="nav nav-side large">
   {% for page in pages %}
   <li{% if page.is_active %} class="active"{% endif %}>
-    <a href="{% url page.link user_slug=profile.slug user_id=profile.pk %}">
+    <a href="{% url page.link user_slug=profile.slug user_id=profile.id %}">
       {{ page.name }}
       {% if page.badge != None %}
       <span class="badge">{{ page.badge }}</span>

misago/templates/misago/profile/warnings.html

@@ -145,7 +145,7 @@
         <ul class="list-unstyled actions pull-right">
           {% if warning.acl.can_cancel %}
           <li>
-            <form action="{% url 'misago:cancel_warning' user_slug=profile.slug user_id=profile.pk warning_id=warning.pk %}" method="POST" class="cancel-warning-prompt">
+            <form action="{% url 'misago:cancel_warning' user_slug=profile.slug user_id=profile.id warning_id=warning.id %}" method="POST" class="cancel-warning-prompt">
               {% csrf_token %}
               <button type="submit" class="btn btn-default">
                 {% trans "Cancel" %}
@@ -155,7 +155,7 @@
           {% endif %}
           {% if warning.acl.can_delete %}
           <li>
-            <form action="{% url 'misago:delete_warning' user_slug=profile.slug user_id=profile.pk warning_id=warning.pk %}" method="POST" class="delete-warning-prompt">
+            <form action="{% url 'misago:delete_warning' user_slug=profile.slug user_id=profile.id warning_id=warning.id %}" method="POST" class="delete-warning-prompt">
               {% csrf_token %}
               <button type="submit" class="btn btn-default">
                 {% trans "Delete" %}
@@ -169,7 +169,7 @@
     </div>
     {% endfor %}
   </div>
-  {% pagination warnings "misago/profile/pagination.html" 'misago:user_warnings' user_slug=profile.slug user_id=profile.pk %}
+  {% pagination warnings "misago/profile/pagination.html" 'misago:user_warnings' user_slug=profile.slug user_id=profile.id %}
 {% else %}
 <p class="lead">
   {% if is_authenticated_user %}

misago/templates/misago/user_nav.html

@@ -8,7 +8,7 @@
     </a>
     <ul class="dropdown-menu">
       <li>
-        <a href="{% url USER_PROFILE_URL user_slug=user.slug user_id=user.pk %}">
+        <a href="{% url USER_PROFILE_URL user_slug=user.slug user_id=user.id %}">
           <span class="fa fa-user"></span>
           {% trans "See your profile" %}
         </a>

misago/users/views/admin/users.py

@@ -191,7 +191,7 @@ class NewUser(UserAdmin, generic.ModelFormView):
 
         messages.success(request, self.message_submit % target.username)
         return redirect('misago:admin:users:accounts:edit',
-                        user_id=new_user.pk)
+                        user_id=new_user.id)
 
 
 class EditUser(UserAdmin, generic.ModelFormView):