Fix apply link for custom timeranges. Fixes #180

library/Grafana/Helpers/Timeranges.php

@@ -123,15 +123,16 @@ private function buildTimerangeMenu($timerange = "", $timerangeto = "")
             $timerangeto = $d->format("Y-m-d H:i:s");
         }
 
-        unset($this->array['timerange']);
-        $form_link = $this->view->url($this->link, $this->array);
+        unset($this->urlparams['timerange']);
+        $form_link = $this->view->url($this->link, $this->urlparams);
         $menu .= '<td>
                     <form method="get" class="grafana-module-tr-form" action="'.$form_link.'">
                         <input type="text" value="'.$timerange.'" placeholder="from" name="tr-from" />
                         <input type="text" value="'.$timerangeto.'" placeholder="to" name="tr-to" />
                         <a href="'.$form_link.'" data-base-target="_self" class="action-link grafana-module-tr-apply">Apply</a>
                     </form>
                   </td>';
+        $menu .= '</tr></table>';
         $menu .= '<script type="text/javascript">
 $( document ).ready(function() {
     $("a.grafana-module-tr-apply").click(function() {
@@ -154,8 +155,6 @@ private function buildTimerangeMenu($timerange = "", $timerangeto = "")
     });    
 });
 </script>';
-        $menu .= '</tr></table>';
-
         return $menu;
     }
 

module.info

@@ -1,5 +1,5 @@
 Name: Grafana
-Version: 1.3.1
+Version: master
 Depends: monitoring
 Description: Grafana - A perfdata visualisation module
  Shows Grafana graphs for captured metrics.