Merge pull request #404 from creative-commoners/pulls/5.0/dev-task-br…

…oken-links FIX Broken TaskLink & QueueLink
symbiote · Apr 27, 2023 · ecd2305 · ecd2305
2 parents d57063b + acc4752
commit ecd2305
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/src/Controllers/QueuedTaskRunner.php b/src/Controllers/QueuedTaskRunner.php
@@ -3,6 +3,7 @@
 namespace Symbiote\QueuedJobs\Controllers;
 
 use SilverStripe\Admin\AdminRootController;
+use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Core\Convert;
@@ -102,8 +103,8 @@ public function index()
             }
 
             $taskList->push(ArrayData::create([
-                'QueueLink' => $baseUrl . 'dev/tasks/queue/' . $task['segment'],
-                'TaskLink' => $baseUrl . 'dev/tasks/' . $task['segment'],
+                'QueueLink' => Controller::join_links($baseUrl, 'dev/tasks/queue', $task['segment']),
+                'TaskLink' => Controller::join_links($baseUrl, 'dev/tasks', $task['segment']),
                 'Title' => $task['title'],
                 'Description' => $task['description'],
                 'Type' => 'universal',
@@ -113,7 +114,7 @@ public function index()
         // Non-queueable tasks
         foreach ($backlistedTasks as $task) {
             $taskList->push(ArrayData::create([
-                'TaskLink' => $baseUrl . 'dev/tasks/' . $task['segment'],
+                'TaskLink' => Controller::join_links($baseUrl, 'dev/tasks', $task['segment']),
                 'Title' => $task['title'],
                 'Description' => $task['description'],
                 'Type' => 'immediate',
@@ -125,7 +126,7 @@ public function index()
 
         foreach ($queuedOnlyTasks as $task) {
             $taskList->push(ArrayData::create([
-                'QueueLink' => $baseUrl . 'dev/tasks/queue/' . $task['segment'],
+                'QueueLink' => Controller::join_links($baseUrl, 'dev/tasks/queue', $task['segment']),
                 'Title' => $task['title'],
                 'Description' => $task['description'],
                 'Type' => 'queue-only',
@@ -187,8 +188,12 @@ public function queueTask($request)
                 $jobID = Injector::inst()->get(QueuedJobService::class)->queueJob($job);
 
                 $message('Done: queued with job ID ' . $jobID);
-                $adminUrl = Director::baseURL() . AdminRootController::config()->get('url_base');
-                $adminLink = $adminUrl . "/queuedjobs/" . str_replace('\\', '-', QueuedJobDescriptor::class);
+                $adminLink = Controller::join_links(
+                    Director::baseURL(),
+                    AdminRootController::config()->get('url_base'),
+                    'queuedjobs',
+                    str_replace('\\', '-', QueuedJobDescriptor::class)
+                );
                 $message("Visit <a href=\"$adminLink\">queued jobs admin</a> to see job status");
                 return;
             }