patch

lbr38 · Dec 29, 2024 · 3e4638c · 3e4638c
1 parent 2f55e76
commit 3e4638c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/www/controllers/Task/Notify.php b/www/controllers/Task/Notify.php
@@ -152,7 +152,7 @@ public function error(array $task, string $error)
         $message .= '<br>';
 
         $mailSubject = '[ ERROR ] Scheduled task #' . $task['Id'] . ' failed on ' . WWW_HOSTNAME;
-        $mymail = new \Controllers\Mail(implode(',', $taskRawParams['schedule']['schedule-recipient']), $mailSubject, $message, __SERVER_PROTOCOL__ . '://' . WWW_HOSTNAME . '/run?task-log=' . $task['Logfile'], 'View log file');
+        $mymail = new \Controllers\Mail(implode(',', $taskRawParams['schedule']['schedule-recipient']), $mailSubject, $message, __SERVER_PROTOCOL__ . '://' . WWW_HOSTNAME . '/run/' . $task['Id'], 'View log file');
     }
 
     /**
@@ -168,6 +168,6 @@ public function success(array $task)
         $message .= '<br>';
 
         $mailSubject = '[ SUCCESS ] Scheduled task #' . $task['Id'] . ' succeeded on ' . WWW_HOSTNAME;
-        $mymail = new \Controllers\Mail(implode(',', $taskRawParams['schedule']['schedule-recipient']), $mailSubject, $message, __SERVER_PROTOCOL__ . '://' . WWW_HOSTNAME . '/run?task-log=' . $task['Logfile'], 'View log file');
+        $mymail = new \Controllers\Mail(implode(',', $taskRawParams['schedule']['schedule-recipient']), $mailSubject, $message, __SERVER_PROTOCOL__ . '://' . WWW_HOSTNAME . '/run/' . $task['Id'], 'View log file');
     }
 }
diff --git a/www/controllers/Task/Repo/Metadata/Create.php b/www/controllers/Task/Repo/Metadata/Create.php
@@ -16,8 +16,6 @@ private function createMetadata()
 
         $this->loggingStepController->new('create-repo-metadata', 'CREATING REPOSITORY');
 
-        // echo '<div class="hide createRepoDiv"><pre class="codeblock">';
-
         if ($this->repo->getPackageType() == 'rpm') {
             $repoPath = REPOS_DIR . '/' . $this->repo->getDateFormatted() . '_' . $this->repo->getName();
         }

diff --git a/www/views/includes/containers/header/menu.inc.php b/www/views/includes/containers/header/menu.inc.php
@@ -64,7 +64,7 @@
                                 $taskParams = json_decode($task['Raw_params'], true); ?>
 
                                 <div class="header-op-subdiv btn-large-red">
-                                    <a href="/run?task-log=<?= $task['Logfile'] ?>">
+                                    <a href="/run/<?= $task['Id'] ?>">
                                         <span>
                                             <?php
                                             if ($taskParams['action'] == 'create') {

diff --git a/www/views/includes/containers/repos/properties.inc.php b/www/views/includes/containers/repos/properties.inc.php
@@ -59,7 +59,7 @@
                             </div>
                             <div>
                                 <span>
-                                    <a href="/run?task-log=<?= $lastScheduledTask['Logfile'] ?>"><?= DateTime::createFromFormat('Y-m-d', $lastScheduledTask['Date'])->format('d-m-Y') . ' ' . $lastScheduledTask['Time'] ?></a>
+                                    <a href="/run/<?= $lastScheduledTask['Id'] ?>"><?= DateTime::createFromFormat('Y-m-d', $lastScheduledTask['Date'])->format('d-m-Y') . ' ' . $lastScheduledTask['Time'] ?></a>
                                 </span>
                             </div>
                         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ @@
                                 </div>
                                 <div>
                                     <span>
-                                        <a href="/run?task-log=<?= $lastScheduledTask['Logfile'] ?>"><?= DateTime::createFromFormat('Y-m-d', $lastScheduledTask['Date'])->format('d-m-Y') . ' ' . $lastScheduledTask['Time'] ?></a>
+                                        <a href="/run/<?= $lastScheduledTask['Id'] ?>"><?= DateTime::createFromFormat('Y-m-d', $lastScheduledTask['Date'])->format('d-m-Y') . ' ' . $lastScheduledTask['Time'] ?></a>
                                     </span>
                                 </div>
                             </div>
@@ Expand Down @@