feat(showjobs): Show delete file name

Show the filename of the deleted upload in Show Job pages and add the author table for UTF migration script. Fix the color mismatch on show jobs. Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>
fossology · Jul 9, 2020 · dbd4115 · dbd4115
1 parent 4be59ee
commit dbd4115
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/install/db/dbmigrate_3.7-3.8.php b/install/db/dbmigrate_3.7-3.8.php
@@ -36,6 +36,7 @@
  */
 const ENCODE_TABLES = array(
   "copyright",
+  "author",
   "ecc",
   "keyword"
 );

diff --git a/src/www/ui/ajax-uploads.php b/src/www/ui/ajax-uploads.php
@@ -61,7 +61,7 @@ function Output()
         $V .= " (" . htmlentities($upload['upload_desc']) . ")";
       }
       if (! empty($upload['upload_ts'])) {
-        $V .= " :: " . htmlentities($upload['upload_ts']);
+        $V .= " :: " . htmlentities(Convert2BrowserTime($upload['upload_ts']));
       }
       $V .= "</option>\n";
     }

diff --git a/src/www/ui/async/AjaxShowJobs.php b/src/www/ui/async/AjaxShowJobs.php
@@ -136,7 +136,9 @@ protected function getGeekyScanDetailsForJob($job_pk)
         case 'job_queued':
         case 'jq_starttime':
         case 'jq_endtime':
-          $value = Convert2BrowserTime($row[$field]);
+          if (! empty($row[$field])) {
+            $value = Convert2BrowserTime($row[$field]);
+          }
           break;
         case 'jq_itemsprocessed':
           $value = number_format($row[$field]);
@@ -230,8 +232,14 @@ protected function getShowJobsForEachJob($jobData)
         'jobQueue' => $jobs['jobqueue']
       );
       foreach ($jobArr['jobQueue'] as $key => $singleJobQueue) {
-        $jobArr['jobQueue'][$key]['jq_starttime'] = Convert2BrowserTime($jobArr['jobQueue'][$key]['jq_starttime']);
-        $jobArr['jobQueue'][$key]['jq_endtime'] = Convert2BrowserTime($jobArr['jobQueue'][$key]['jq_endtime']) ;
+        if (! empty($jobArr['jobQueue'][$key]['jq_starttime'])) {
+          $jobArr['jobQueue'][$key]['jq_starttime'] = Convert2BrowserTime(
+            $jobArr['jobQueue'][$key]['jq_starttime']);
+        }
+        if (! empty($jobArr['jobQueue'][$key]['jq_endtime'])) {
+          $jobArr['jobQueue'][$key]['jq_endtime'] = Convert2BrowserTime(
+            $jobArr['jobQueue'][$key]['jq_endtime']) ;
+        }
         if (! empty($singleJobQueue["jq_endtime"])) {
           $numSecs = strtotime($singleJobQueue['jq_endtime']) -
             strtotime($singleJobQueue['jq_starttime']);

diff --git a/src/www/ui/template/ui-showjobs.js.twig b/src/www/ui/template/ui-showjobs.js.twig
@@ -113,6 +113,9 @@ function createTableForJob(job) {
     uploadLink = '<a title="{{ "Click to browse"|trans }}" ' +
     'href="?mod=browse&upload=' + job.upload.uploadId + '&item=' +
     job.upload.uploadItem + '">' + job.upload.uploadName + '</a>';
+  } else if (job.upload !== null && job.job.jobName == "Delete") {
+    uploadLink = '<span style="color:black">' + job.upload.uploadName +
+      ' (Deleted)</span>';
   } else {
     uploadLink = '<span style="color:black">' + job.job.jobName + '</span>';
   }