From 166e6d8ac0aebd886ca64f3c6371012445a38495 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Sun, 10 Apr 2016 11:55:42 +0600
Subject: [PATCH] Fixed doubling of the data in the "Error" tab (Build view)
 Fixed some JS errors

---
 PHPCI/View/Build/view.phtml                |  1 +
 public/assets/js/build-plugins/loc.js      |  2 +-
 public/assets/js/build-plugins/warnings.js |  2 +-
 public/assets/js/build.js                  | 62 +++++++++++-----------
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/PHPCI/View/Build/view.phtml b/PHPCI/View/Build/view.phtml
index 61fafd33..03f23368 100644
--- a/PHPCI/View/Build/view.phtml
+++ b/PHPCI/View/Build/view.phtml
@@ -149,6 +149,7 @@
                     </tr>
                 </thead>
                 <tbody>
+                <?php print $data['error_html']; ?>
                 </tbody>
             </table>
         </div>
diff --git a/public/assets/js/build-plugins/loc.js b/public/assets/js/build-plugins/loc.js
index 89e703b8..c08a58c0 100644
--- a/public/assets/js/build-plugins/loc.js
+++ b/public/assets/js/build-plugins/loc.js
@@ -16,7 +16,7 @@ var locPlugin = ActiveBuild.UiPlugin.extend({
         });
 
         $(window).on('build-updated', function(data) {
-            if (data.queryData.status > 1 && !self.rendered) {
+            if (data.queryData && data.queryData.status > 1 && !self.rendered) {
                 query();
             }
         });
diff --git a/public/assets/js/build-plugins/warnings.js b/public/assets/js/build-plugins/warnings.js
index bf5ea04b..6e50e945 100644
--- a/public/assets/js/build-plugins/warnings.js
+++ b/public/assets/js/build-plugins/warnings.js
@@ -32,7 +32,7 @@ var warningsPlugin = ActiveBuild.UiPlugin.extend({
         });
 
         $(window).on('build-updated', function(data) {
-            if (!self.rendered && data.queryData.status > 1) {
+            if (!self.rendered && data.queryData && data.queryData.status > 1) {
                 self.displayOnUpdate = true;
                 for (var query in queries) {
                   queries[query]();
diff --git a/public/assets/js/build.js b/public/assets/js/build.js
index 4b9c10a1..bc7369ed 100644
--- a/public/assets/js/build.js
+++ b/public/assets/js/build.js
@@ -23,45 +23,47 @@ var Build = Class.extend({
             self.buildData = data.queryData;
 
             // If the build has finished, stop updating every 10 seconds:
-            if (self.buildData.status > 1) {
+            if (self.buildData && self.buildData.status > 1) {
                 self.cancelQuery('build-updated');
                 $(window).trigger({type: 'build-complete'});
             }
 
-            $('.build-duration').data('duration', self.buildData.duration ? self.buildData.duration : '');
-            $('.build-started').data('date', self.buildData.started ? self.buildData.started : '');
-            $('.build-finished').data('date', self.buildData.finished ? self.buildData.finished : '');
-            $('#log pre').html(self.buildData.log);
-            $('.errors-table tbody').append(self.buildData.error_html);
+            if (self.buildData) {
+                $('.build-duration').data('duration', self.buildData.duration ? self.buildData.duration : '');
+                $('.build-started').data('date', self.buildData.started ? self.buildData.started : '');
+                $('.build-finished').data('date', self.buildData.finished ? self.buildData.finished : '');
+                $('#log pre').html(self.buildData.log);
+                $('.errors-table tbody').html(self.buildData.error_html);
 
-            if (self.buildData.errors == 0) {
-                $('.errors-label').hide();
-            } else {
-                $('.errors-label').text(self.buildData.errors);
-                $('.errors-label').show();
-            }
+                if (self.buildData.errors == 0) {
+                    $('.errors-label').hide();
+                } else {
+                    $('.errors-label').text(self.buildData.errors);
+                    $('.errors-label').show();
+                }
 
-            switch (self.buildData.status) {
-                case 0:
-                    $('body').removeClass('skin-red skin-green skin-yellow');
-                    $('body').addClass('skin-blue');
-                    break;
+                switch (self.buildData.status) {
+                    case 0:
+                        $('body').removeClass('skin-red skin-green skin-yellow');
+                        $('body').addClass('skin-blue');
+                        break;
 
-                case 1:
-                    $('body').removeClass('skin-red skin-green skin-blue');
-                    $('body').addClass('skin-yellow');
-                    break;
+                    case 1:
+                        $('body').removeClass('skin-red skin-green skin-blue');
+                        $('body').addClass('skin-yellow');
+                        break;
 
-                case 2:
-                    $('body').removeClass('skin-red skin-blue skin-yellow');
-                    $('body').addClass('skin-green');
-                    break;
+                    case 2:
+                        $('body').removeClass('skin-red skin-blue skin-yellow');
+                        $('body').addClass('skin-green');
+                        break;
 
-                case 3:
-                    $('body').removeClass('skin-blue skin-green skin-yellow');
-                    $('body').addClass('skin-red');
-                    break;
+                    case 3:
+                        $('body').removeClass('skin-blue skin-green skin-yellow');
+                        $('body').addClass('skin-red');
+                        break;
 
+                }
             }
 
             PHPCI.uiUpdated();
@@ -77,7 +79,7 @@ var Build = Class.extend({
             var fullUri = window.PHPCI_URL + uri;
 
             if (name == 'build-updated') {
-                fullUri = window.PHPCI_URL + 'build/data/' + self.buildId + '?since=' + self.buildData.since;
+                fullUri = window.PHPCI_URL + 'build/data/' + self.buildId;
             }
 
             $.ajax({