diff options
| author | Juha Sippola <juhasippola@ovi.com> | 2014-06-10 21:46:14 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-11 07:16:56 +0200 |
| commit | 7ba3b7f0f659edd1982020adef665cdddda96188 (patch) | |
| tree | 5e8f2d704cb7cdd671a3d1fb6a2694cffb54485c | |
| parent | 35c21ed0b3428cff709e9467175287498fc7e60e (diff) | |
Qt Metrics v2.3.1: Fix to a timescale selection case
If project don't have any builds since a selected filter date,
the all data part in autotest dashboard is empty and therefore
should not be checked. In such a case all project builds were
checked. Parameter initialization corrected.
Change-Id: I8cfc29aedbc535d87d5c01372cc2ab0a29708c82
Reviewed-by: Tony SarajΓ€rvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | non-puppet/qtmetrics/ci/showautotestdashboard.php | 6 | ||||
| -rw-r--r-- | non-puppet/qtmetrics/footer.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/non-puppet/qtmetrics/ci/showautotestdashboard.php b/non-puppet/qtmetrics/ci/showautotestdashboard.php index 3eed127..ad93ced 100644 --- a/non-puppet/qtmetrics/ci/showautotestdashboard.php +++ b/non-puppet/qtmetrics/ci/showautotestdashboard.php @@ -576,6 +576,7 @@ if ($autotest == "All") { /* Step 2.1: All autotests for comparison (read from the autotest xml files) */ /* Get the first available build number or the first after the selected time scale. Note: Another check is which builds include the test result xml files in the first place (see $minBuildNumberInDirectory) */ + $minBuildNumberInDatabase = MAXCIBUILDNUMBER; $projectFilter = "project=\"$project\""; // Project is filtered here $timescaleFilter = ""; if ($timescaleType <> "All") @@ -596,10 +597,11 @@ if ($autotest == "All") { $resultRow2 = mysqli_fetch_row($result2); else $resultRow2 = mysql_fetch_row($result2); - $minBuildNumberInDatabase = $resultRow2[$dbColumnCiBuildNumber]; - $_SESSION['minBuildNumberInDatabase'] = $minBuildNumberInDatabase; // Save for level 2 + if ($resultRow2[$dbColumnCiBuildNumber] <> NULL AND $resultRow2[$dbColumnCiBuildNumber] <> "") + $minBuildNumberInDatabase = $resultRow2[$dbColumnCiBuildNumber]; if ($useMysqli) mysqli_free_result($result2); // Free result set + $_SESSION['minBuildNumberInDatabase'] = $minBuildNumberInDatabase; // Save for level 2 /* Read the test results from the Project directory (structure is e.g. QtBase_stable_Integration/build_03681/macx-ios-clang_OSX_10.8 */ if (isset($_SESSION['previousProject'])) { diff --git a/non-puppet/qtmetrics/footer.php b/non-puppet/qtmetrics/footer.php index e991c76..999e9ed 100644 --- a/non-puppet/qtmetrics/footer.php +++ b/non-puppet/qtmetrics/footer.php @@ -42,7 +42,7 @@ ?> <div id="footer"> -<b>Report builder v2.3 9-Jun-2014</b><br/> +<b>Report builder v2.3.1 10-Jun-2014</b><br/> Description, guidance and support:<br/> <a href="http://qt-project.org/wiki/Qt_Metrics_Page_Description" target="_blank">http://qt-project.org/wiki/Qt_Metrics_Page_Description</a> </div> |