From 8ae30388aa7e7ed0b4d32da744eb2366d9ca1bcb Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 15 Aug 2013 12:30:19 +0100 Subject: [PATCH] webui: some minor corrections to mpegts/idnode code --- src/webui/static/app/idnode.js | 2 +- src/webui/static/app/mpegts.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/webui/static/app/idnode.js b/src/webui/static/app/idnode.js index 9ccbfee6..8c9cb88a 100644 --- a/src/webui/static/app/idnode.js +++ b/src/webui/static/app/idnode.js @@ -347,7 +347,7 @@ tvheadend.idnode_create = function(conf) } else { select = function (s, n, o) { params = conf.select.clazz.params || {}; - params['uuid'] = puuid = n.data.uuid; + params['uuid'] = puuid = n.id; Ext.Ajax.request({ url : conf.select.clazz.url || conf.select.url || conf.url, success : function(d) { diff --git a/src/webui/static/app/mpegts.js b/src/webui/static/app/mpegts.js index dca6600b..aaa308f3 100644 --- a/src/webui/static/app/mpegts.js +++ b/src/webui/static/app/mpegts.js @@ -14,8 +14,8 @@ tvheadend.network_list = new Ext.data.JsonStore({ url : 'api/idnode/load', baseParams : { class : 'mpegts_network', enum: 1 }, root : 'entries', - fields : [ 'uuid', 'title' ], - id : 'uuid', + fields : [ 'key', 'val' ], + id : 'key', autoLoad : true, }); @@ -61,8 +61,8 @@ tvheadend.muxes = function(panel) select : { label : 'Network', store : tvheadend.network_list, - displayField : 'title', - valueField : 'uuid', + valueField : 'key', + displayField : 'val', clazz : { url : 'api/mpegts/network/mux_class' } @@ -94,7 +94,10 @@ tvheadend.satconfs = function(panel) comet : 'linuxdvb_satconf', titleS : 'Satconf', titleP : 'Satconfs', - add : {}, + add : { + url : 'api/linuxdvb/satconf', + create : {} + }, del : true, edittree : true, });