From 0bde2ae689a2e5cc232973af7d2fba3fcea5de0a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 19 Sep 2016 10:07:53 +0200
Subject: [PATCH] fix(alertlist): remove timerange checkbox option

---
 public/app/plugins/panel/alertlist/editor.html | 11 ++---------
 public/app/plugins/panel/alertlist/module.ts   |  9 +++------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/public/app/plugins/panel/alertlist/editor.html b/public/app/plugins/panel/alertlist/editor.html
index 7ea95c39e02..b75a7e453aa 100644
--- a/public/app/plugins/panel/alertlist/editor.html
+++ b/public/app/plugins/panel/alertlist/editor.html
@@ -22,15 +22,8 @@
   </div>
 
   <div class="section gf-form-group" ng-if="ctrl.panel.show == 'changes'">
-    <h5 class="section-heading">Time options</h5>
-    <gf-form-switch
-      class="gf-form"
-      label="Within time range"
-      label-class="width-11"
-      tooltip="Show alert changes within the dashboard time range"
-      checked="ctrl.panel.useTimeRange"
-      on-change="ctrl.onRender()"></gf-form-switch>
-  </div>
+    <!-- <h5 class="section-heading">Current state</h5> -->
+	</div>
 
   <div class="section gf-form-group" ng-if="ctrl.panel.show == 'current'">
     <!-- <h5 class="section-heading">Current state</h5> -->
diff --git a/public/app/plugins/panel/alertlist/module.ts b/public/app/plugins/panel/alertlist/module.ts
index ddfd77619b7..7adf072cb0d 100644
--- a/public/app/plugins/panel/alertlist/module.ts
+++ b/public/app/plugins/panel/alertlist/module.ts
@@ -24,8 +24,7 @@ class AlertListPanel extends PanelCtrl {
   panelDefaults = {
     show: 'current',
     limit: 10,
-    stateFilter: [],
-    useTimeRange: false
+    stateFilter: []
   };
 
   /** @ngInject */
@@ -72,10 +71,8 @@ class AlertListPanel extends PanelCtrl {
       newState: this.panel.stateFilter
     };
 
-    if (this.panel.useTimeRange) {
-      params.from = dateMath.parse(this.dashboard.time.from).unix() * 1000;
-      params.to = dateMath.parse(this.dashboard.time.to).unix() * 1000;
-    }
+    params.from = dateMath.parse(this.dashboard.time.from).unix() * 1000;
+    params.to = dateMath.parse(this.dashboard.time.to).unix() * 1000;
 
     this.backendSrv.get(`/api/annotations`, params)
       .then(res => {