Browse Source

order => orderBy

order
Luke Childs 8 years ago
parent
commit
f1babf918a
  1. 8
      controllers/listing.js
  2. 6
      views/listing.html

8
controllers/listing.js

@ -1,6 +1,6 @@
const tor = require('../lib/tor'); const tor = require('../lib/tor');
const orderValues = [ const orderByValues = [
'consensus_weight', 'consensus_weight',
'first_seen' 'first_seen'
]; ];
@ -21,8 +21,8 @@ module.exports = (req, res, next) => {
if(req.query.p) { if(req.query.p) {
query.offset = (query.limit * req.query.p) - query.limit; query.offset = (query.limit * req.query.p) - query.limit;
} }
if(req.query.order && orderValues.includes(req.query.order)) { if(req.query.orderBy && orderByValues.includes(req.query.orderBy)) {
query.order = req.query.order; query.order = req.query.orderBy;
} }
tor.listNodes(query) tor.listNodes(query)
@ -31,7 +31,7 @@ module.exports = (req, res, next) => {
title: title, title: title,
nodes: nodes, nodes: nodes,
numOfNodes: query.limit, numOfNodes: query.limit,
orderValues: orderValues orderByValues: orderByValues
})) }))
.catch(err => { .catch(err => {
if(err.statusCode == 400 && req.query.s) { if(err.statusCode == 400 && req.query.s) {

6
views/listing.html

@ -6,9 +6,9 @@
<form action="/"> <form action="/">
<input type="hidden" name="s" value="{{ req.query.s }}" /> <input type="hidden" name="s" value="{{ req.query.s }}" />
<input type="hidden" name="p" value="{{ req.query.p }}" /> <input type="hidden" name="p" value="{{ req.query.p }}" />
<select name="order"> <select name="orderBy">
{% for order in orderValues %} {% for orderBy in orderByValues %}
<option value="{{ order }}">{{ order }}</option> <option value="{{ orderBy }}">{{ orderBy }}</option>
{% endfor %} {% endfor %}
</select> </select>
<input type="submit" /> <input type="submit" />

Loading…
Cancel
Save