IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-29 15:59:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat(timepicker2): temporarily removed the the option to define custom quick range, will have to be part of future issue, closes #2761

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-09-19 12:20:24 +02:00
parent 86f4907cc4
commit 2f68687de9
5 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/core/utils/rangeutil.ts
+10 -3
View File
@@ -56,13 +56,19 @@ _.each(rangeOptions, function (frame) {
});
function getRelativeTimesList(timepickerSettings, currentDisplay) {
return _.groupBy(rangeOptions, (option: any) => {
var groups = _.groupBy(rangeOptions, (option: any) => {
option.active = option.display === currentDisplay;
return option.section;
});
// return _.map(timepickerSettings.time_options, function(duration: string) {
// return describeTextRange(duration);
// _.each(timepickerSettings.time_options, (duration: string) => {
// let info = describeTextRange(duration);
// if (info.section) {
// groups[info.section].push(info);
// }
// });
return groups;
}
function formatDate(date) {
@@ -94,6 +100,7 @@ _.each(rangeOptions, function (frame) {
let span = spans[unit];
if (span) {
opt.display = 'Last ' + amount + ' ' + span.display;
opt.section = span.section;
if (amount > 1) {
opt.display += 's';
}