Switch to pk rather than id for view parameters

Django's built-in generic views use "pk" to receive the id of the objects
as parameter, so it's more consistent to do the same thing.

coin/members/templates/members/subscriptions.html

@@ -22,7 +22,7 @@
             <td>{{ subscription.subscription_date }}</td>
             <td>{{ subscription.resign_date|default_if_none:"" }}</td>
             <td>{{ subscription.configuration.comment }}</td>
-            <td>{% if subscription.configuration and subscription.configuration.url_namespace %}<a class="cfglink" href="{% url subscription.configuration.get_url_namespace|add:":details" id=subscription.configuration.id %}"><i class="fa fa-cog"></i> Configuration</a>{% endif %}</td>
+            <td>{% if subscription.configuration and subscription.configuration.url_namespace %}<a class="cfglink" href="{% url subscription.configuration.get_url_namespace|add:":details" pk=subscription.configuration.pk %}"><i class="fa fa-cog"></i> Configuration</a>{% endif %}</td>
             
         </tr>
         {% endfor %}

coin/vpn/urls.py

@@ -8,8 +8,8 @@ urlpatterns = patterns(
     '',
     # This is part of the generic configuration interface (the "name" is
     # the same as the "backend_name" of the model).
-    url(r'^(?P<id>\d+)$', VPNView.as_view(template_name="vpn/vpn.html"), name="details"),
-    url(r'^password/(?P<id>\d+)$', VPNGeneratePasswordView.as_view(template_name="vpn/fragments/password.html"), name="generate_password"),
+    url(r'^(?P<pk>\d+)$', VPNView.as_view(template_name="vpn/vpn.html"), name="details"),
+    url(r'^password/(?P<pk>\d+)$', VPNGeneratePasswordView.as_view(template_name="vpn/fragments/password.html"), name="generate_password"),
     url(r'^graph/(?P<vpn_id>[0-9]+)/(?P<period>[a-z]+)$', get_graph, name="get_graph"),
     url(r'^graph/(?P<vpn_id>[0-9]+)$', get_graph, name="get_graph"),
 )

coin/vpn/views.py

@@ -28,9 +28,9 @@ class VPNView(SuccessMessageMixin, UpdateView):
 
     def get_object(self):
         if self.request.user.is_superuser:
-            return get_object_or_404(VPNConfiguration, pk=self.kwargs.get("id"))
+            return get_object_or_404(VPNConfiguration, pk=self.kwargs.get("pk"))
         # For normal users, ensure the VPN belongs to them.
-        return get_object_or_404(VPNConfiguration, pk=self.kwargs.get("id"),
+        return get_object_or_404(VPNConfiguration, pk=self.kwargs.get("pk"),
                                  offersubscription__member=self.request.user)