forked from AFPy/PonyConf
Separation of status and score in order to be able to sort on score. Closes #22
This commit is contained in:
parent
787bc67794
commit
183a41fede
|
@ -387,7 +387,7 @@ class Talk(PonyConfModel):
|
||||||
elif self.accepted is False:
|
elif self.accepted is False:
|
||||||
return _('Refused')
|
return _('Refused')
|
||||||
else:
|
else:
|
||||||
return _('Pending decision, score: %(score).1f') % {'score': self.score}
|
return _('Pending decision')
|
||||||
|
|
||||||
def get_status_color(self):
|
def get_status_color(self):
|
||||||
if self.accepted is True:
|
if self.accepted is True:
|
||||||
|
|
|
@ -58,6 +58,7 @@
|
||||||
<th class="text-center">{% trans "Track" %}</th>
|
<th class="text-center">{% trans "Track" %}</th>
|
||||||
<th class="text-center">{% trans "Tags" %}</th>
|
<th class="text-center">{% trans "Tags" %}</th>
|
||||||
<th class="text-center">{% trans "Status" %} <a href="?{{ sort_urls.status }}"><span class="glyphicon glyphicon-{{ sort_glyphicons.status }} pull-right"></span></a></th>
|
<th class="text-center">{% trans "Status" %} <a href="?{{ sort_urls.status }}"><span class="glyphicon glyphicon-{{ sort_glyphicons.status }} pull-right"></span></a></th>
|
||||||
|
<th class="text-center">{% trans "Score" %} <a href="?{{ sort_urls.score }}"><span class="glyphicon glyphicon-{{ sort_glyphicons.score }} pull-right"></span></a></th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tfoot>
|
<tfoot>
|
||||||
|
@ -84,9 +85,8 @@
|
||||||
</td>
|
</td>
|
||||||
<td>{{ talk.track|default:"–" }}</td>
|
<td>{{ talk.track|default:"–" }}</td>
|
||||||
<td>{{ talk.get_tags_html }}</td>
|
<td>{{ talk.get_tags_html }}</td>
|
||||||
<td>
|
<td>{{ talk.get_status_str }}</td>
|
||||||
{{ talk.get_status_str }}
|
<td>{{ talk.score }}</td>
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{% if forloop.last%}
|
{% if forloop.last%}
|
||||||
</tbody>
|
</tbody>
|
||||||
|
|
|
@ -730,6 +730,7 @@ def talk_list(request):
|
||||||
'title': 'title',
|
'title': 'title',
|
||||||
'category': 'category',
|
'category': 'category',
|
||||||
'status': 'accepted',
|
'status': 'accepted',
|
||||||
|
'score': 'score',
|
||||||
}
|
}
|
||||||
sort = request.GET.get('sort')
|
sort = request.GET.get('sort')
|
||||||
if sort in SORT_MAPPING.keys():
|
if sort in SORT_MAPPING.keys():
|
||||||
|
|
Loading…
Reference in New Issue