diff --git a/src/webui/extjs.c b/src/webui/extjs.c index 7f2c53fc..658b37c1 100644 --- a/src/webui/extjs.c +++ b/src/webui/extjs.c @@ -786,6 +786,9 @@ extjs_epg(http_connection_t *hc, const char *remain, void *opaque) htsmsg_add_u32(m, "start", e->start); htsmsg_add_u32(m, "end", e->stop); htsmsg_add_u32(m, "duration", e->stop - e->start); + + if(e->serieslink) + htsmsg_add_str(m, "serieslink", e->serieslink->uri); if((eg = LIST_FIRST(&ee->genre))) { htsmsg_add_u32(m, "contenttype", eg->code); diff --git a/src/webui/static/app/dvr.js b/src/webui/static/app/dvr.js index 46736946..ca45ee58 100644 --- a/src/webui/static/app/dvr.js +++ b/src/webui/static/app/dvr.js @@ -456,18 +456,11 @@ tvheadend.autoreceditor = function() { emptyText: 'Only include channel...' }) },{ - header : "Brand", - dataIndex: 'brand', - editor : new Ext.form.ComboBox({ - loadingText: 'Loading...', - displayField: 'title', - valueField: 'uri', - store: tvheadend.brands, - mode: 'local', - editable: false, - triggerAction: 'all', - emptyText: 'Record brand...' - }) + header : "SeriesLink", + dataIndex: 'serieslink', + renderer : function(v) { + return v ? 'yes' : 'no'; + } },{ header: "Channel tag", dataIndex: 'tag', @@ -649,7 +642,7 @@ tvheadend.dvr = function() { tvheadend.autorecRecord = Ext.data.Record.create([ - 'enabled','title', 'brand', 'channel','tag','creator','contenttype','comment', + 'enabled','title', 'serieslink', 'channel','tag','creator','contenttype','comment', 'weekdays', 'pri', 'approx_time', 'config_name' ]); diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js index 1e970323..0c92d17c 100644 --- a/src/webui/static/app/epg.js +++ b/src/webui/static/app/epg.js @@ -92,7 +92,7 @@ tvheadend.epgDetails = function(event) { }), new Ext.Button({ handler: recordSeries, - text: "Record series" + text: event.serieslink ? "Record series" : "Autorec" }) ], buttonAlign: 'center', @@ -161,7 +161,7 @@ tvheadend.epgDetails = function(event) { var ab = new Ext.data.JsonStore({ root: 'entries', url: 'epgrelated', - autoLoad: true, + autoLoad: false, id: 'id', baseParams: { op: 'get', id: event.id, type: 'alternative' }, fields: Ext.data.Record.create([ 'id', 'channel', 'start' ]), @@ -170,7 +170,7 @@ tvheadend.epgDetails = function(event) { var re = new Ext.data.JsonStore({ root: 'entries', url: 'epgrelated', - autoLoad: true, + autoLoad: false, id: 'uri', baseParams: { op: 'get', id: event.id, type: 'related' }, fields: Ext.data.Record.create([ 'uri', 'title', 'subtitle', 'episode']), @@ -219,7 +219,8 @@ tvheadend.epg = function() { {name: 'end', type: 'date', dateFormat: 'U' /* unix time */}, {name: 'duration'}, {name: 'contenttype'}, - {name: 'schedstate'} + {name: 'schedstate'}, + {name: 'serieslink'}, ]) });