Merge branch 'v3.0.x'

91c6ebb0 · Torkel Ödegaard · 2e02abff · df0ddc0b · 91c6ebb0
Commit 91c6ebb0 authored May 20, 2016 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

public/app/plugins/datasource/prometheus/query_ctrl.ts
+4 -0

No files found.
--- a/public/app/plugins/datasource/prometheus/query_ctrl.ts
+++ b/public/app/plugins/datasource/prometheus/query_ctrl.ts
@@ -58,6 +58,10 @@ class PrometheusQueryCtrl extends QueryCtrl {

  updateLink() {
    var range = this.panelCtrl.range;
+    if (!range) {
+      return;
+    }
+
    var rangeDiff = Math.ceil((range.to.valueOf() - range.from.valueOf()) / 1000);
    var endTime = range.to.utc().format('YYYY-MM-DD HH:mm');
    var expr = {