From: Andreas Öman <andreas@lonelycoder.com>
Date: Fri, 16 Nov 2012 11:05:06 +0000 (+0100)
Subject: Fix DVB URI /dvbnetworks -> /dev/locations
X-Git-Tag: v3.9^2~229^2~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7092bc14504d6cf9d950f128f111eed85bfbf9ea;p=thirdparty%2Ftvheadend.git

Fix DVB URI /dvbnetworks -> /dev/locations
---

diff --git a/src/webui/extjs_dvb.c b/src/webui/extjs_dvb.c
index 443bf22f8..c1c1c632b 100644
--- 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 3f1ccb0d6..bdbc022b3 100644
--- 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'