jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1835977 - in /jmeter/trunk/bin/report-template/content/js: dashboard-commons.js.fmkr graph.js.fmkr
Date Sun, 15 Jul 2018 13:58:17 GMT
Author: pmouawad
Date: Sun Jul 15 13:58:17 2018
New Revision: 1835977

URL: http://svn.apache.org/viewvc?rev=1835977&view=rev
Log:
Bug 62367 - HTML Report Generator: Add Graph Total Transactions per Second
Fix empty graph when a jmeter.reportgenerator.exporter.html.series_filter is defined
Bugzilla Id: 62367

Modified:
    jmeter/trunk/bin/report-template/content/js/dashboard-commons.js.fmkr
    jmeter/trunk/bin/report-template/content/js/graph.js.fmkr

Modified: jmeter/trunk/bin/report-template/content/js/dashboard-commons.js.fmkr
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/dashboard-commons.js.fmkr?rev=1835977&r1=1835976&r2=1835977&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/js/dashboard-commons.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/dashboard-commons.js.fmkr Sun Jul 15 13:58:17
2018
@@ -298,12 +298,13 @@ function prepareOptions(options, data) {
 /**
  * @param data
  * @param noMatchColor if defined and true, series.color are not matched with index
+ * @param ignoreFilterParam If true we don't apply seriesFilter
  */
-function prepareSeries(data, noMatchColor){
+function prepareSeries(data, noMatchColor, ignoreFilterParam){
     var result = data.result;
-
+    var ignoreFilter = ignoreFilterParam === true;
     // Keep only series when needed
-    if(seriesFilter && (!filtersOnlySampleSeries || result.supportsControllersDiscrimination)){
+    if(!ignoreFilter && seriesFilter && (!filtersOnlySampleSeries || result.supportsControllersDiscrimination)){
         // Insensitive case matching
         var regexp = new RegExp(seriesFilter, 'i');
         result.series = $.grep(result.series, function(series, index){

Modified: jmeter/trunk/bin/report-template/content/js/graph.js.fmkr
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/graph.js.fmkr?rev=1835977&r1=1835976&r2=1835977&view=diff
==============================================================================
--- jmeter/trunk/bin/report-template/content/js/graph.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/graph.js.fmkr Sun Jul 15 13:58:17 2018
@@ -1206,7 +1206,8 @@ var totalTPSInfos = {
 // Total Transactions per second
 function refreshTotalTPS(fixTimestamps) {
     var infos = totalTPSInfos;
-    prepareSeries(infos.data);
+    // We want to ignore seriesFilter
+    prepareSeries(infos.data, false, true);
     if(fixTimestamps) {
         fixTimeStamps(infos.data.result.series, ${(timeZoneOffset?c)!0});
     }



Mime
View raw message