minor options updates
Costa Tsaousis (ktsaou) committed
Dec 3, 2015 at 09:34 UTC
f8f6fd3d48b34fc16be4c29caff6aca9b688e50f
2 files changed
+4
-6
src/web_client.c
+2
-4
@@ -455,7 +455,7 @@ int web_client_api_request_v1_data_format(char *name)
455
else if(!strcmp(name, DATASOURCE_FORMAT_CSV)) // csv
456
return DATASOURCE_CSV;
457
458
- else if(!strcmp(name, DATASOURCE_FORMAT_TSV)) // tsv
458
+ else if(!strcmp(name, DATASOURCE_FORMAT_TSV) || !strcmp(name, "tsv-excel")) // tsv
459
return DATASOURCE_TSV;
460
461
else if(!strcmp(name, DATASOURCE_FORMAT_HTML)) // html
@@ -467,9 +467,6 @@ int web_client_api_request_v1_data_format(char *name)
467
else if(!strcmp(name, DATASOURCE_FORMAT_SSV_COMMA)) // ssvcomma
468
return DATASOURCE_SSV_COMMA;
469
470
- else if(!strcmp(name, "tsv-excel"))
471
- return DATASOURCE_TSV;
472
-
470
return DATASOURCE_JSON;
471
}
472
@@ -506,6 +503,7 @@ int web_client_api_request_v1_charts(struct web_client *w, char *url)
503
if(url) { ; }
504
505
buffer_flush(w->response.data);
506
+ w->response.data->contenttype = CT_APPLICATION_JSON;
507
rrd_stats_api_v1_charts(w->response.data);
508
return 200;
509
}
web/dashboard.js
+2
-2
@@ -1240,7 +1240,7 @@
1240
initialized: false,
1241
enabled: true,
1242
format: 'array',
1243
- options: 'flip|min2max|jsonwrap',
1243
+ options: 'flip|abs|jsonwrap',
1244
jsonWrapper: true,
1245
pixels_per_point: 2,
1246
detects_dimensions_on_update: false
@@ -1252,7 +1252,7 @@
1252
initialized: false,
1253
enabled: true,
1254
format: 'ssvcomma',
1255
- options: 'null2zero|flip|min2max|jsonwrap',
1255
+ options: 'null2zero|flip|abs|jsonwrap',
1256
jsonWrapper: true,
1257
pixels_per_point: 2,
1258
detects_dimensions_on_update: false