Merge pull request #158 from deathbybandaid/dev

Channel Editor Web Fixings

fHDHR_web/pages/channels_editor_html.py

@@ -18,7 +18,7 @@ class Channels_Editor_HTML():
 
     def get(self, *args):
 
-        origin = request.args.get('source', default=self.fhdhr.device.epg.def_method, type=str)
+        origin = request.args.get('origin', default=self.fhdhr.device.epg.def_method, type=str)
         origin_methods = self.fhdhr.origins.valid_origins
         if origin not in origin_methods:
             origin = origin_methods[0]

fHDHR_web/pages/channels_html.py

@@ -17,7 +17,7 @@ class Channels_HTML():
 
     def get(self, *args):
 
-        origin = request.args.get('source', default=self.fhdhr.device.epg.def_method, type=str)
+        origin = request.args.get('origin', default=self.fhdhr.device.epg.def_method, type=str)
         origin_methods = self.fhdhr.origins.valid_origins
         if origin not in origin_methods:
             origin = origin_methods[0]

fHDHR_web/templates/channels.html

@@ -6,12 +6,12 @@
 
   <p>
     {% for origin in origin_methods %}
-      <button onclick="location.href='/channels?source={{ origin }}'" type="button">{{ origin }}</button>
+      <button onclick="location.href='/channels?origin={{ origin }}'" type="button">{{ origin }}</button>
     {% endfor %}
   </p>
 
   <div style="text-align: center;">
-    <button onclick="location.href='/api/tuners?method=scan&origin={{ origin }}&redirect=/channels'" type="button">Force Channel Update</button>
+    <button onclick="location.href='/api/tuners?method=scan&origin={{ origin }}&redirect=/channels?origin={{ origin }}'" type="button">Force Channel Update</button>
     <p> Note: This may take some time.</p>
   </div>
   <br>