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

Legend Current value did not display when value was zero, Fixes #460

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-06-02 19:28:51 +02:00
parent 384687e19b
commit 62af77979b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -11,6 +11,7 @@ vNext
Options are now reloaded correctly and there are no multiple renders/refresh inbetween (#447), Options are now reloaded correctly and there are no multiple renders/refresh inbetween (#447),
After an option is changed and a nested template param is also reloaded, if the current value After an option is changed and a nested template param is also reloaded, if the current value
exists after the options are reloaded the current selected value is kept (Closes #447, Closes #412) exists after the options are reloaded the current selected value is kept (Closes #447, Closes #412)
- Legend Current value did not display when value was zero, Fixes #460
# 1.5.4 (2014-05-13) # 1.5.4 (2014-05-13)
### New features and improvements ### New features and improvements

10
src/app/panels/graphite/timeSeries.js
View File

@@ -60,11 +60,11 @@ function (_, kbn) {
this.info.current = result[result.length-1][1]; this.info.current = result[result.length-1][1];
var formater = kbn.getFormatFunction(yFormats[this.yaxis - 1], 2); var formater = kbn.getFormatFunction(yFormats[this.yaxis - 1], 2);
this.info.avg = this.info.avg ? formater(this.info.avg) : null; this.info.avg = this.info.avg != null ? formater(this.info.avg) : null;
this.info.current = this.info.current ? formater(this.info.current) : null; this.info.current = this.info.current != null ? formater(this.info.current) : null;
this.info.min = this.info.min ? formater(this.info.min) : null; this.info.min = this.info.min != null ? formater(this.info.min) : null;
this.info.max = this.info.max ? formater(this.info.max) : null; this.info.max = this.info.max != null ? formater(this.info.max) : null;
this.info.total = this.info.total ? formater(this.info.total) : null; this.info.total = this.info.total != null ? formater(this.info.total) : null;
} }
return result; return result;

2
tasks/default_task.js
View File

@@ -1,5 +1,5 @@
// Lint and build CSS // Lint and build CSS
module.exports = function(grunt) { module.exports = function(grunt) {
grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']); grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat:css']);
grunt.registerTask('test', ['default', 'karma:test']); grunt.registerTask('test', ['default', 'karma:test']);
}; };