diff --git a/legislature/urls.py b/legislature/urls.py index e85a64a7f4ae62c4c10e46fff5f7197f3c182dd8..ba80ceb1a20ef9fcb9f622538103828d85d096f2 100644 --- a/legislature/urls.py +++ b/legislature/urls.py @@ -35,12 +35,6 @@ urlpatterns = [ representative.detail, name='representative-detail' ), - # Representative detail by representative pk - url( - r'^(?P<pk>\d+)$', - representative.detail, - name='representative-detail' - ), # List of representatives by group kind and group name or pk url( r'^(?P<group_kind>\w+)/(?P<group>.+)$', diff --git a/legislature/views/representative.py b/legislature/views/representative.py index a2408597ef3d0ef643c58fdc70d0d6c81197fba6..b59a8e36a5b6cd7835564916a7c3a09530cde0f1 100644 --- a/legislature/views/representative.py +++ b/legislature/views/representative.py @@ -82,22 +82,14 @@ def index(request, group_kind=None, group=None): ) -def detail(request, pk=None, name=None): +def detail(request, name=None): + query_set = MemopolRepresentative.objects.select_related( + 'country', + 'main_mandate' + ) + try: - query_set = MemopolRepresentative.objects.select_related( - 'country', - 'main_mandate' - ) - if pk: - representative = query_set.get( - id=pk - ) - elif name: - representative = query_set.get( - slug=name - ) - else: - return Http404() + representative = query_set.get(slug=name) except MemopolRepresentative.DoesNotExist: return Http404()