Commit 7e912da9 authored by Abdullah Abdurrah's avatar Abdullah Abdurrah
Browse files

Merge branch 'master' of github.com:jrouly/srct-vahack

parents 75a28b43 86e60f5a
......@@ -17,7 +17,7 @@
<div class="text-left col-md-3">
<h4 class="profile-heading">Name</h4>
<h2 class="profile-value">{{requested_user.name}}</h2>
<h2 class="profile-value">{{requested_user.user}}</h2>
<h4 class="profile-heading">Location</h4>
<h2 class="profile-value">{{requested_user.city}}</h2>
......@@ -45,12 +45,8 @@
<div class="col-md-6 text-left">
<h2>Tags</h2>
<p>
{% for tag in person_tags %}
{% if person_tags.people.user == requested_user %}
[{{ tag }}]
{% endif %}
{% for tag in global_tags %}
[{{ tag }}]
{% endfor %}
</p>
</div>
......
......@@ -71,8 +71,9 @@ def opportunity(request, slug):
def person(request, slug):
return render_to_response('person.html', {
"current_user" : request.user,
"requested_user" : get_object_or_404( Person, slug=slug),
"person_tags" : Tags.objects.all(),
"requested_user" : Person.objects.get(user__username=slug),
#"requested_tags" : Person.objects.get(user__username=slug).tags,
"global_tags" : Tag.objects.all(),
},
context_instance = RequestContext(request),
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment