Fix DVB URI /dvbnetworks -> /dev/locations

diff --git a/src/webui/extjs_dvb.c b/src/webui/extjs_dvb.c
index 443bf22f813567986eed4858864b01f06fa45dcd..c1c1c632b7efa95b395dd500c089cfc8bccf925e 100644 (file)
--- a/src/webui/extjs_dvb.c
+++ b/src/webui/extjs_dvb.c
@@ -47,7 +47,7 @@
  *
  */
 static int
-extjs_dvbnetworks(http_connection_t *hc, const char *remain, void *opaque)
+extjs_dvblocations(http_connection_t *hc, const char *remain, void *opaque)
 {
   htsbuf_queue_t *hq = &hc->hc_reply;
   const char *s = http_arg_get(&hc->hc_req_args, "node");
@@ -691,8 +691,8 @@ extjs_list_dvb_adapters(htsmsg_t *array)
 void
 extjs_start_dvb(void)
 {
-  http_path_add("/dvbnetworks", 
-               NULL, extjs_dvbnetworks, ACCESS_WEB_INTERFACE);
+  http_path_add("/dvb/locations", 
+               NULL, extjs_dvblocations, ACCESS_WEB_INTERFACE);
 
   http_path_add("/dvb/adapter", 
                NULL, extjs_dvbadapter, ACCESS_ADMIN);

diff --git a/src/webui/static/app/dvb.js b/src/webui/static/app/dvb.js
index 3f1ccb0d6946d3603bfeee9cd605ad2962b717b0..bdbc022b3ed21e5f7dc75b3c90c9b6c97cd35d50 100644 (file)
--- a/src/webui/static/app/dvb.js
+++ b/src/webui/static/app/dvb.js
@@ -668,7 +668,7 @@ tvheadend.addMuxByLocation = function(adapterData, satConfStore) {
                        baseParams : {
                                adapter : adapterData.identifier
                        },
-                       dataUrl : 'dvbnetworks'
+                       dataUrl : 'dvb/locations'
                }),
                root : new Ext.tree.AsyncTreeNode({
                        id : 'root'