From 7c3d44c42ea55d495a2821026d2118a194190d60 Mon Sep 17 00:00:00 2001 From: Calum Lind Date: Thu, 20 Nov 2014 21:43:30 +0000 Subject: [PATCH] [#2588] [WebUI] Fix Size column to show total_wanted * It is more useful to show total_wanted and now matches GTKUI column. --- deluge/ui/web/js/deluge-all/Keys.js | 4 ++-- deluge/ui/web/js/deluge-all/TorrentGrid.js | 4 ++-- deluge/ui/web/js/deluge-all/data/TorrentRecord.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deluge/ui/web/js/deluge-all/Keys.js b/deluge/ui/web/js/deluge-all/Keys.js index 1be58cf05..18dda5fbc 100644 --- a/deluge/ui/web/js/deluge-all/Keys.js +++ b/deluge/ui/web/js/deluge-all/Keys.js @@ -39,7 +39,7 @@ Deluge.Keys = { /** * Keys that are used within the torrent grid. - *
['queue', 'name', 'total_size', 'state', 'progress', 'num_seeds',
+	 * 
['queue', 'name', 'total_wanted', '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',
@@ -47,7 +47,7 @@ Deluge.Keys = {
 	 * 'seeds_peers_ratio']
*/ Grid: [ - 'queue', 'name', 'total_size', 'state', 'progress', 'num_seeds', + 'queue', 'name', 'total_wanted', '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', diff --git a/deluge/ui/web/js/deluge-all/TorrentGrid.js b/deluge/ui/web/js/deluge-all/TorrentGrid.js index ea2446317..c333fe16f 100644 --- a/deluge/ui/web/js/deluge-all/TorrentGrid.js +++ b/deluge/ui/web/js/deluge-all/TorrentGrid.js @@ -119,7 +119,7 @@ width: 75, sortable: true, renderer: fsize, - dataIndex: 'total_size' + dataIndex: 'total_wanted' }, { header: _('Progress'), width: 150, @@ -236,7 +236,7 @@ fields: [ {name: 'queue', sortType: Deluge.data.SortTypes.asQueuePosition}, {name: 'name', sortType: Deluge.data.SortTypes.asName}, - {name: 'total_size', type: 'int'}, + {name: 'total_wanted', type: 'int'}, {name: 'state'}, {name: 'progress', type: 'float'}, {name: 'num_seeds', type: 'int'}, diff --git a/deluge/ui/web/js/deluge-all/data/TorrentRecord.js b/deluge/ui/web/js/deluge-all/data/TorrentRecord.js index e372e0124..883b14c2e 100644 --- a/deluge/ui/web/js/deluge-all/data/TorrentRecord.js +++ b/deluge/ui/web/js/deluge-all/data/TorrentRecord.js @@ -50,7 +50,7 @@ Deluge.data.Torrent = Ext.data.Record.create([{ type: 'string', sortType: Deluge.data.SortTypes.asName }, { - name: 'total_size', + name: 'total_wanted', type: 'int' }, { name: 'state',