diff --git a/deluge/ui/web/js/deluge-all/Keys.js b/deluge/ui/web/js/deluge-all/Keys.js index 64fe0f8cd..459e8bcfe 100644 --- a/deluge/ui/web/js/deluge-all/Keys.js +++ b/deluge/ui/web/js/deluge-all/Keys.js @@ -42,13 +42,17 @@ Deluge.Keys = { *
['queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',
* 'total_seeds', 'num_peers', 'total_peers', 'download_payload_rate',
* 'upload_payload_rate', 'eta', 'ratio', 'distributed_copies',
- * 'is_auto_managed', 'time_added', 'tracker_host']
+ * 'is_auto_managed', 'time_added', 'tracker_host', 'save_path',
+ * 'total_done', 'total_uploaded', 'max_download_speed', 'max_upload_speed',
+ * 'seeds_peers_ratio']
*/
Grid: [
'queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',
'total_seeds', 'num_peers', 'total_peers', 'download_payload_rate',
'upload_payload_rate', 'eta', 'ratio', 'distributed_copies',
- 'is_auto_managed', 'time_added', 'tracker_host', 'save_path', 'last_seen_complete'
+ 'is_auto_managed', 'time_added', 'tracker_host', 'save_path', 'last_seen_complete',
+ 'total_done', 'total_uploaded', 'max_download_speed', 'max_upload_speed',
+ 'seeds_peers_ratio'
],
/**
diff --git a/deluge/ui/web/js/deluge-all/TorrentGrid.js b/deluge/ui/web/js/deluge-all/TorrentGrid.js
index de3672eda..ddc096846 100644
--- a/deluge/ui/web/js/deluge-all/TorrentGrid.js
+++ b/deluge/ui/web/js/deluge-all/TorrentGrid.js
@@ -43,6 +43,10 @@
if (!value) return;
return fspeed(value);
}
+ function torrentLimitRenderer(value) {
+ if (value == -1) return '';
+ return fspeed(value * 1024.0);
+ }
function torrentProgressRenderer(value, p, r) {
value = new Number(value);
var progress = value;
@@ -64,8 +68,8 @@
return value;
}
}
- function availRenderer(value, p, r) {
- return (value < 0) ? '∞' : new Number(value).toFixed(3);
+ function availRenderer(value, p, r) {
+ return (value < 0) ? '∞' : parseFloat(new Number(value).toFixed(3));
}
function trackerRenderer(value, p, r) {
return String.format('