IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(timpicker): another name change to make quick ranges nameing more consistent, fixes #3465

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-12-10 13:01:41 +01:00
parent aa4ac9fa05
commit 6ea00a4f7c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/utils/rangeutil.ts
View File

@ -19,7 +19,7 @@ var rangeOptions = [
{ from: 'now/d', to: 'now/d', display: 'Today', section: 2 }, { from: 'now/d', to: 'now/d', display: 'Today', section: 2 },
{ from: 'now/d', to: 'now', display: 'Today so far', section: 2 }, { from: 'now/d', to: 'now', display: 'Today so far', section: 2 },
{ from: 'now/w', to: 'now/w', display: 'This week', section: 2 }, { from: 'now/w', to: 'now/w', display: 'This week', section: 2 },
{ from: 'now/w', to: 'now', display: 'Week so far', section: 2 }, { from: 'now/w', to: 'now', display: 'This week so far', section: 2 },
{ from: 'now/M', to: 'now/M', display: 'This month', section: 2 }, { from: 'now/M', to: 'now/M', display: 'This month', section: 2 },
{ from: 'now/y', to: 'now/y', display: 'This year', section: 2 }, { from: 'now/y', to: 'now/y', display: 'This year', section: 2 },

2
public/test/core/utils/rangeutil_specs.ts
View File

@ -46,7 +46,7 @@ describe("rangeUtil", () => {
it('should handle now/w', () => { it('should handle now/w', () => {
var info = rangeUtil.describeTextRange('now/w'); var info = rangeUtil.describeTextRange('now/w');
expect(info.display).to.be('Week so far'); expect(info.display).to.be('This week so far');
}); });
}); });