|
@@ -133,6 +133,10 @@ _.each(rangeOptions, function (frame) {
|
|
|
return from.fromNow() + ' to ' + formatDate(range.to);
|
|
return from.fromNow() + ' to ' + formatDate(range.to);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ if (!moment.isMoment(range.from) && !moment.isMoment(range.to)) {
|
|
|
|
|
+ return formatDate(dateMath.parse(range.from, true)) + ' to ' + formatDate(dateMath.parse(range.to, true));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
var res = describeTextRange(range.from);
|
|
var res = describeTextRange(range.from);
|
|
|
return res.display;
|
|
return res.display;
|
|
|
}
|
|
}
|