From ddf15539135d64bfd03ad168469ec1f429a94def Mon Sep 17 00:00:00 2001 From: msharif ahrari Date: Tue, 28 Aug 2018 18:51:11 +0430 Subject: [PATCH] fix custom route when we are in subdirectory https://github.com/Dionera/laravel-beanstalkd-admin-ui/issues/13 --- src/Controllers/TubesController.php | 3 +-- src/Resources/assets/js/app.js | 4 +--- src/Resources/assets/js/failed-jobs-table.js | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Controllers/TubesController.php b/src/Controllers/TubesController.php index 5d98028..0a1b568 100644 --- a/src/Controllers/TubesController.php +++ b/src/Controllers/TubesController.php @@ -35,7 +35,6 @@ public function __construct(PheanstalkInterface $pheanstalk, JobRepository $jobs public function index() { $tubeNames = collect($this->pheanstalk->listTubes()); - // Adam Wathan give me your strength! $tubes = collect($tubeNames)->map(function ($tube) { return collect($this->pheanstalk->statsTube($tube))->slice(1)->all(); @@ -58,7 +57,7 @@ public function showTube($tube) $nextReady = $this->jobs->nextReady($tube, true); $nextBuried = $this->jobs->nextBuried($tube); $nextDelayed = $this->jobs->nextDelayed($tube, true); - $prefix = config('beanstalkdui.prefix'); + $prefix = url()->to('/'.config('beanstalkdui.prefix')); return view('beanstalkdui::tubes.show', compact( 'nextReady', diff --git a/src/Resources/assets/js/app.js b/src/Resources/assets/js/app.js index 8a54a11..82033d0 100644 --- a/src/Resources/assets/js/app.js +++ b/src/Resources/assets/js/app.js @@ -29,9 +29,7 @@ new Vue({ methods: { prefixUrl: function (url){ - return this.prefix.length > 0 - ? '/' + this.prefix + url - : url + return this.prefix + url; }, fetchData: function () { $.get(this.prefixUrl('/beanstalkd/api/tubes/' + this.tube), function (response) { diff --git a/src/Resources/assets/js/failed-jobs-table.js b/src/Resources/assets/js/failed-jobs-table.js index 0c86129..78ba3eb 100644 --- a/src/Resources/assets/js/failed-jobs-table.js +++ b/src/Resources/assets/js/failed-jobs-table.js @@ -18,9 +18,7 @@ new Vue({ methods: { prefixUrl: function (url){ - return this.prefix.length > 0 - ? '/' + this.prefix + url - : url + return this.prefix + url; }, refresh: function (notify) { $.get(this.prefixUrl('/beanstalkd/api/tubes/' + this.tube + '/failed'), function (response) {