135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backend field in jobqueue (#1114)

Browse Source 
implements #969
This commit is contained in:
Oliver Gorwits
2023-10-24 21:49:37 +01:00
committed by GitHub
parent d6e36dcad0
commit 21bc8cf63e
13 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
share/schema_versions/App-Netdisco-DB-81-82-PostgreSQL.sql Normal file
View File

@@ -0,0 +1,5 @@
BEGIN;
ALTER TABLE admin ADD COLUMN "backend" text;
COMMIT;

7
share/schema_versions/App-Netdisco-DB-82-83-PostgreSQL.sql Normal file
View File

@@ -0,0 +1,7 @@
BEGIN;
UPDATE admin SET backend = regexp_replace(status, '^queued-', '', '') WHERE status ~ '^queued-';
UPDATE admin SET status = 'queued' WHERE status ~ '^queued-';
COMMIT;

10
share/views/ajax/admintask/jobqueue.tt
View File

@@ -26,14 +26,10 @@
<tr
[% ' class="nd_jobqueueitem success"' IF row.status == 'done' %]
[% ' class="nd_jobqueueitem error"' IF row.status == 'error' %]
[% ' class="nd_jobqueueitem info"' IF row.status.search('^queued-') %]
[% ' class="nd_jobqueueitem info"' IF (row.status == 'queued' AND row.backend != '') %]
data-content="[% row.log | html_entity %]"
>
[% IF row.status.search('^queued-') %]
<td class="nd_center-cell">[% row.status.remove('^queued-') | html_entity %]</td>
[% ELSE %]
<td class="nd_center-cell"></td>
[% END %]
<td class="nd_center-cell">[% row.backend | html_entity %]</td>
<td class="nd_center-cell">
[% FOREACH word IN row.action.split('_') %]
@@ -51,7 +47,7 @@
<td class="nd_center-cell">[% row.username | html_entity %]</td>
[% IF row.status.search('^queued-') %]
[% IF (row.status == 'queued' AND row.backend != '') %]
<td class="nd_center-cell">Running</td>
[% ELSE %]
<td class="nd_center-cell">[% row.status.ucfirst | html_entity %]</td>