Merge pull request #3200 from antgonza/2022.05

2022.05
qiita-spots · May 12, 2022 · 1dee59f · 1dee59f
2 parents 874b993 + 5e89b95
commit 1dee59f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Qiita changelog
 
+Version 2022.05
+-----------------
+
+* Added `Artifact.iter()` for easier Artifact interactions.
+* Fixed the SCP Qiita transfer; [this was the problem and solution](https://github.com/paramiko/paramiko/issues/1961).
+* Added `User.email` to the Admin Job Processing listing.
+
 Version 2022.04
 ---------------
 

diff --git a/qiita_pet/handlers/admin_processing_job.py b/qiita_pet/handlers/admin_processing_job.py
@@ -80,7 +80,8 @@ def get(self):
 
                     jobs.append([job.id, job.command.name, job.status, msg,
                                  outputs, validator_jobs, heartbeat,
-                                 job.parameters.values, job.external_id])
+                                 job.parameters.values, job.external_id,
+                                 job.user.email])
         results = {
             "sEcho": echo,
             "recordsTotal": len(jobs),

diff --git a/qiita_pet/templates/admin_processing_job.html b/qiita_pet/templates/admin_processing_job.html
@@ -72,7 +72,7 @@
 
       //row[8] is PBS/Torque/Slurm id
       out.push('<b class="' + statusToClass[status] + '">' + status + ' ' +
-                row[0] + ' ' + '</b> ');
+                row[0] + ' </b> [ ' + row[9] + ' ]</br>');
 
       if (status === 'running' || status === 'queued') {
         // row[0] is qiita job-id