Compare qtest version > 8.9.4 then enable new UI

jenkinsci · Feb 6, 2018 · 796c984 · 796c984
1 parent bb32dba
commit 796c984
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/com/qasymphony/ci/plugin/action/PushingResultAction.java b/src/main/java/com/qasymphony/ci/plugin/action/PushingResultAction.java
@@ -615,7 +615,7 @@ public JSONObject getQtestInfo(String qTestUrl) {
       try {
         Object qTestInfo = ConfigService.getQtestInfo(qTestUrl);
         if (null != qTestInfo) {
-            res.put("qTestInfo", null == qTestInfo ? "" : JSONObject.fromObject(qTestInfo));
+            res.put("qTestInfo", JSONObject.fromObject(qTestInfo));
             return res;
         }
       } catch (Exception ex) {

diff --git a/src/main/webapp/js/app.js b/src/main/webapp/js/app.js
@@ -58,9 +58,10 @@ $j(document).ready(function () {
             var name = (data.qTestInfo.name || "").toLowerCase();
             var versions = (data.qTestInfo.version || "").split(".");
             if (("test-conductor" === name || "${pom.name}" === name) && 3 === versions.length) {
-                // 8.7.3
-                if ((+versions[0] === 8 && +versions[1] > 7)
-                || (+versions[0] === 8 && +versions[1] === 7 && +versions[2] > 3)
+                // 8.9.4
+                if (
+                   (+versions[0] === 8 && +versions[1] > 9)
+                || (+versions[0] === 8 && +versions[1] === 9 && +versions[2] > 4)
                 || (+versions[0] > 8)
                 ) {
                     enabled = true;