From 4a60cb8801ba6460865c0cc78b18d4947b55701e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 8 Sep 2014 09:28:52 +0200 Subject: [PATCH] WEBUI JS: DVR - fix the date filters, fix the file size rendering --- src/webui/static/app/dvr.js | 11 +++++++++++ src/webui/static/app/idnode.js | 11 ++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index af6866e1..6071c7aa 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -212,6 +212,17 @@ tvheadend.dvr_finished = function(panel, index) { list: 'disp_title,episode,start_real,stop_real,' + 'duration,filesize,channelname,creator,' + 'sched_status,url', + columns: { + filesize: { + renderer: function() { + return function(v) { + if (v == null) + return ''; + return parseInt(v / 1000000) + ' MB'; + } + } + } + }, sort: { field: 'start', direction: 'DESC' diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js index d95fbcc4..b636d919 100644 --- a/src/webui/static/app/idnode.js +++ b/src/webui/static/app/idnode.js @@ -135,6 +135,7 @@ tvheadend.IdNodeField = function(conf) this.column = function(conf) { + var cfg = conf && this.id in conf ? conf[this.id] : {}; var w = 300; var ftype = 'string'; if (this.type === 'int' || this.type === 'u32' || @@ -144,6 +145,7 @@ tvheadend.IdNodeField = function(conf) w = 80; } else if (this.type === 'time') { w = 120; + ftype = 'date'; if (this.durations) { ftype = 'numeric'; w = 80; @@ -155,17 +157,12 @@ tvheadend.IdNodeField = function(conf) if (this.enum || this.list) w = 300; - if (conf && this.id in conf) { - if (conf[this.id].width) - w = conf[this.id].width; - } - var props = { - width: w, + width: cfg.width || w, dataIndex: this.id, header: this.text, editor: this.editor({create: false}), - renderer: this.renderer(), + renderer: cfg.renderer ? cfg.renderer() : this.renderer(), editable: !this.rdonly, hidden: this.hidden, filter: {