IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-07-30 00:08:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not break dashboard settings UI when time intervals end with trailing comma (#26126)

Browse Source
This commit is contained in:
Dominik Prokop
2020-07-08 08:52:06 +02:00
committed by GitHub
parent 2b6833d0da
commit 30a682a4da
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/components/DashboardSettings/SettingsCtrl.ts
+1 -1
View File
@@ -255,7 +255,7 @@ export class SettingsCtrl {
};
onRefreshIntervalChange = (intervals: string[]) => {
this.dashboard.timepicker.refresh_intervals = intervals;
this.dashboard.timepicker.refresh_intervals = intervals.filter(i => i.trim() !== '');
};
onNowDelayChange = (nowDelay: string) => {
public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
+1 -1
View File
@@ -112,7 +112,7 @@ export class TimePickerSettings extends PureComponent<Props, State> {
<div className="gf-form">
<span className="gf-form-label width-7">Auto-refresh</span>
<Input width={60} value={this.getRefreshIntervals()} onChange={this.onRefreshIntervalChange} />
<Input width={60} defaultValue={this.getRefreshIntervals()} onBlur={this.onRefreshIntervalChange} />
</div>
<div className="gf-form">
<span className="gf-form-label width-7">Now delay now-</span>