WEB UI: EPG: Fix the channel tag passing to autorec, fix idnode enum renderer, fixes #2340

This commit is contained in:
Jaroslav Kysela 2014-10-05 17:59:45 +02:00
parent a69cec62d6
commit 8d2c02574a
2 changed files with 5 additions and 5 deletions

View file

@ -862,7 +862,7 @@ tvheadend.epg = function() {
};
if (params.title) conf.title = params.title;
if (params.channel) conf.channel = params.channel;
if (params.tag) conf.tag = params.tag;
if (params.tag) conf.tag = params.channelTag;
if (params.contentType) conf.content_type = params.contentType;
if (params.durationMin) conf.minduration = params.durationMin;
if (params.durationMax) conf.maxduration = params.durationMax;

View file

@ -297,13 +297,13 @@ tvheadend.IdNodeField = function(conf)
var t = [];
var d = v.push ? v : [v];
for (var i = 0; i < d.length; i++) {
var r = st.find('key', d[i]);
if (r !== -1) {
var nv = st.getAt(r).get('val');
var r = st.getById(d[i]);
if (r) {
var nv = r.data.val;
if (nv)
t.push(nv);
} else {
t.push(d[i]);
t.push(d[i]);
}
}
t.sort();