From c805379a7ff75f9c185cd45762ce0b28839e9d41 Mon Sep 17 00:00:00 2001 From: tomtom5152 Date: Wed, 25 Mar 2015 18:56:29 +0000 Subject: [PATCH] Added viewing user profiles --- RIGS/templates/RIGS/profile_detail.html | 37 +++++++++++++++++++++++++ RIGS/urls.py | 7 +++++ RIGS/views.py | 14 +++++++++- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 RIGS/templates/RIGS/profile_detail.html diff --git a/RIGS/templates/RIGS/profile_detail.html b/RIGS/templates/RIGS/profile_detail.html new file mode 100644 index 00000000..f21251b3 --- /dev/null +++ b/RIGS/templates/RIGS/profile_detail.html @@ -0,0 +1,37 @@ +{% extends 'base.html' %} + +{% block title %}RIGS Profile {{object.pk}}{% endblock %} + +{% block content %} +
+
+

{{object.name}}

+
+
First Name
+
{{object.first_name}}
+ +
Last Name
+
{{object.last_name}}
+ +
Email
+
{{object.email}}
+ +
Last Login
+
{{object.last_login}}
+ +
Date Joined
+
{{object.date_joined}}
+ +
Initials
+
{{object.initials}}
+ +
Phone
+
{{object.phone}}
+
+
+
+
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/RIGS/urls.py b/RIGS/urls.py index d50b78cb..dd095bbe 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -106,6 +106,13 @@ urlpatterns = patterns('', permission_required_with_403('RIGS.add_payment')(finance.PaymentDelete.as_view()), name='payment_delete'), + # User editing + url(r'^user/$', login_required(views.ProfileDetail.as_view()), name='profile_detail'), + url(r'^user/(?P\d+)/$', + permission_required_with_403('RIGS.view_profile')(views.ProfileDetail.as_view()), + name='profile_detail'), + # url(r'^user/edit/') + # API url(r'^api/(?P\w+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"), url(r'^api/(?P\w+)/(?P\d+)/$', (views.SecureAPIRequest.as_view()), name="api_secure"), diff --git a/RIGS/views.py b/RIGS/views.py index 6d82cb5c..dfb68d69 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -249,4 +249,16 @@ class SecureAPIRequest(generic.View): json = simplejson.dumps(results[:20]) return HttpResponse(json, content_type="application/json") # Always json - return HttpResponse(model) \ No newline at end of file + return HttpResponse(model) + +class ProfileDetail(generic.DetailView): + model = models.Profile + + def get_queryset(self): + try: + pk = self.kwargs['pk'] + except KeyError: + pk = self.request.user.id + self.kwargs['pk'] = pk + + return self.model.objects.filter(pk=pk) \ No newline at end of file