deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed doubling of the data in the "Error" tab (Build view)

Browse source 
Fixed some JS errors
This commit is contained in:
Dmitry Khomutov 2016-04-10 11:55:42 +06:00
commit 166e6d8ac0
4 changed files with 41 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
PHPCI/View/Build/view.phtml
View file

@ -149,6 +149,7 @@
</tr>
</thead>
<tbody>
<?php print $data['error_html']; ?>
</tbody>
</table>
</div>

2
public/assets/js/build-plugins/loc.js
View file

@ -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();
}
});

2
public/assets/js/build-plugins/warnings.js
View file

@ -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]();

62
public/assets/js/build.js
View file

@ -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({