From f86834b02f9ca27ce1b571be33b56a7bfe3576e0 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Sun, 10 Jul 2016 14:33:18 +0600 Subject: [PATCH] Fix Information tab in build view --- public/assets/js/build.js | 12 ++++++------ src/PHPCI/View/layout.phtml | 30 ------------------------------ 2 files changed, 6 insertions(+), 36 deletions(-) diff --git a/public/assets/js/build.js b/public/assets/js/build.js index ee1ed8b3..26a1a4a3 100644 --- a/public/assets/js/build.js +++ b/public/assets/js/build.js @@ -33,7 +33,7 @@ var Build = Class.extend({ $('.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); + $('.errors-table tbody').append(self.buildData.error_html); if (self.buildData.errors == 0) { $('.errors-label').hide(); @@ -79,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; + fullUri = window.PHPCI_URL + 'build/data/' + self.buildId + '?since=' + self.buildData.since; } $.ajax({ @@ -161,20 +161,20 @@ var Build = Class.extend({ var output = plugin.render(); if (!plugin.box) { - output = $('
').html(output); + output = $('
').append(output); } var container = $('
').addClass('ui-plugin ' + plugin.css).attr('id', plugin.id); - var content = $('
').html(output); + var content = $('
').append(output); content.addClass('box box-default'); if (plugin.title) { content.prepend('

'+plugin.title+'

'); } - container.html(content); + container.append(content); - $('#plugins').html(container); + $('#plugins').append(container); }, UiPlugin: Class.extend({ diff --git a/src/PHPCI/View/layout.phtml b/src/PHPCI/View/layout.phtml index 457c62f0..2e9067bf 100644 --- a/src/PHPCI/View/layout.phtml +++ b/src/PHPCI/View/layout.phtml @@ -202,36 +202,6 @@ getTitle(); ?> - - - -
  • - - - -
  • - -
  • - - - -
  • - - User()->getIsAdmin()): ?> -
  • - - - -
  • - -
  • - - - -
  • - - - */ ?>