fix(timepicker): fixed displaying of customk time ranges, grafana#2861

torkelo · torkelo · commit 7dc923a292fa · 2015-10-01T16:36:38.000+02:00
diff --git a/public/app/core/utils/rangeutil.ts b/public/app/core/utils/rangeutil.ts
@@ -106,7 +106,7 @@ _.each(rangeOptions, function (frame) {
         }
       }
     } else {
-      opt.display = 'parse error';
+      opt.display = opt.from + ' to ' + opt.to;
       opt.invalid = true;
     }
 
diff --git a/public/test/specs/core/utils/rangeutil_specs.ts b/public/test/specs/core/utils/rangeutil_specs.ts
@@ -56,6 +56,11 @@ describe("rangeUtil", () => {
       expect(text).to.be('Last 1 hour')
     });
 
+    it('Date range with rounding ranges', () => {
+      var text = rangeUtil.describeTimeRange({from: 'now/d+6h', to: 'now'});
+      expect(text).to.be('now/d+6h to now')
+    });
+
     it('Date range with absolute to now', () => {
       var text = rangeUtil.describeTimeRange({from: moment([2014,10,10,2,3,4]), to: 'now'});
       expect(text).to.be('Nov 10, 2014 02:03:04 to a few seconds ago')

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ _.each(rangeOptions, function (frame) {`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`	`} else {`
`109`		`- opt.display = 'parse error';`
	`109`	`+ opt.display = opt.from + ' to ' + opt.to;`
`110`	`110`	`opt.invalid = true;`
`111`	`111`	`}`
`112`	`112`