Skip to content

Commit

Permalink
include user rating in reviews
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeman committed Oct 3, 2012
1 parent 1abf1ca commit cc032da
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 4 additions & 2 deletions symposion/reviews/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ def proposals_generator(request, queryset, user_pk=None, check_speaker=True):
lookup_params["user"] = request.user

try:
obj.latest_vote = LatestVote.objects.get(**lookup_params).css_class()
obj.user_vote = LatestVote.objects.get(**lookup_params).vote
obj.user_vote_css = LatestVote.objects.get(**lookup_params).css_class()
except LatestVote.DoesNotExist:
obj.latest_vote = "no-vote"
obj.user_vote = None
obj.user_vote_css = "no-vote"

yield obj

Expand Down
4 changes: 3 additions & 1 deletion symposion/templates/reviews/_review_table.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
<th>{% trans "+0" %}</th>
<th>{% trans "-0" %}</th>
<th>{% trans "-1" %}</th>
<th><a href="#" class="tip" title="{% trans "Your Rating" %}"><i class="icon-user"></i></a></th>
</thead>

<tbody>
{% for proposal in proposals %}
<tr>
<tr class="{{ proposal.user_vote_css }}">
<td>{{ proposal.number }}</td>
<td>
<a href="{% url review_detail proposal.pk %}">
Expand All @@ -29,6 +30,7 @@
<td>{{ proposal.plus_zero }}</td>
<td>{{ proposal.minus_zero }}</td>
<td>{{ proposal.minus_one }}</td>
<td>{{ proposal.user_vote|default:"" }}</td>
</tr>
{% endfor %}
</tbody>
Expand Down
3 changes: 2 additions & 1 deletion symposion/templates/reviews/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@
<script src="{{ STATIC_URL }}tabletools/js/TableTools.min.js" type="text/javascript"></script>
<script src="{{ STATIC_URL }}datatables/js/dataTables.bootstrap.js" type="text/javascript"></script>
<script type="text/javascript">
$(function() {
$(function() {
$(".tip").tooltip();
$("table.table-reviews").dataTable({
"sDom": "<'row'<'span3'l><'span3'T><'span4'f>r>t<'row'<'span3'i><'span5'p>>",
"sPaginationType": "bootstrap",
Expand Down

0 comments on commit cc032da

Please sign in to comment.