mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge remote-tracking branch 'bobrik/color-loading-fix' into pulls
This commit is contained in:
commit
e23d733805
@ -51,7 +51,7 @@ function (angular, _, config) {
|
||||
// Check each query object, populate its defaults
|
||||
_.each(self.list,function(query,id) {
|
||||
_.defaults(query,_query);
|
||||
query.color = colorAt(id);
|
||||
query.color = query.color || colorAt(id);
|
||||
});
|
||||
|
||||
if (self.ids.length === 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user