cms/CockpitCMS-Drone
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of ssh://gitbase.de:2222/cms/CockpitCMS-Drone

Browse Source
This commit is contained in:
Sebastian Frank 2019-06-13 12:39:22 +02:00
commit 2b0dfca323
Signed by: apairon
GPG Key ID: 7270D06DDA7FE8C3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap.php
View File

@ -71,7 +71,7 @@ if (COCKPIT_ADMIN && !COCKPIT_API_REQUEST) {
$building = false; $building = false;
foreach ($deploys as $idx => $deploy) { foreach ($deploys as $idx => $deploy) {
$deploys[$idx]->building = false; $deploys[$idx]->building = false;
if (!in_array($deploy->status, ['success', 'failure'])) { if (!in_array($deploy->status, ['success', 'failure', 'error'])) {
$building = true; $building = true;
$deploys[$idx]->building = true; $deploys[$idx]->building = true;
} }

6
views/deploys/index.php
View File

@ -144,10 +144,10 @@ pre h2.failure {
<tr each="{deploy, $index in deploys}" class="{ deploy.state == 'error' ? 'uk-text-danger' : ''}"> <tr each="{deploy, $index in deploys}" class="{ deploy.state == 'error' ? 'uk-text-danger' : ''}">
<td> <td>
<a onclick="{ showdeployDetails }" class="extrafields-indicator uk-text-nowrap"> <a onclick="{ showdeployDetails }" class="extrafields-indicator uk-text-nowrap">
<span class="uk-badge uk-text-small" if="{!deploy.building && deploy.status !== 'failure' && deploy.status !== 'success' }"><i class="uk-icon-eye uk-icon-justify"></i>{ App.i18n.get(deploy.status) }</span> <span class="uk-badge uk-text-small" if="{!deploy.building && deploy.status !== 'failure' && deploy.status !== 'success' && deploy.status !== 'error' }"><i class="uk-icon-eye uk-icon-justify"></i>{ App.i18n.get(deploy.status) }</span>
<span class="uk-badge uk-text-small uk-badge-success" if="{deploy.status === 'success'}"><i class="uk-icon-eye uk-icon-justify"></i>{ App.i18n.get(deploy.status) }</span> <span class="uk-badge uk-text-small uk-badge-success" if="{deploy.status === 'success'}"><i class="uk-icon-eye uk-icon-justify"></i>{ App.i18n.get(deploy.status) }</span>
<span class="uk-badge uk-text-small uk-badge-danger" if="{deploy.status === 'failure'}"><i class="uk-icon-eye uk-icon-justify"></i>{ App.i18n.get(deploy.status) }</span> <span class="uk-badge uk-text-small uk-badge-danger" if="{deploy.status === 'failure' || deploy.status === 'error'}"><i class="uk-icon-eye uk-icon-justify"></i>{ App.i18n.get(deploy.status) }</span>
<span class="uk-badge uk-text-small uk-badge-warning" if="{deploy.building}"><i class="uk-icon-spinner uk-icon-spin"></i>{ App.i18n.get(deploy.status) }</span> <span class="uk-badge uk-text-small uk-badge-warning" if="{deploy.building && deploy.status !== 'error'}"><i class="uk-icon-spinner uk-icon-spin"></i>{ App.i18n.get(deploy.status) }</span>
</a> </a>
</td> </td>
<td>{ deploy.number }</td> <td>{ deploy.number }</td>