Merge branch 'master' into hubbub

cerpus · Dec 12, 2023 · a3957e6 · a3957e6
2 parents 9a7c219 + 87634bd
commit a3957e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/sourcecode/apis/contentauthor/app/Http/Controllers/ArticleController.php b/sourcecode/apis/contentauthor/app/Http/Controllers/ArticleController.php
@@ -215,7 +215,7 @@ public function edit(Request $request, $id)
                 'canPublish' => $article->canPublish($request),
                 'canList' => $article->canList($request),
                 'useLicense' => config('feature.licensing') === true || config('feature.licensing') === '1',
-                'pulseUrl' => config('feature.content-locking') ? route('lock.status', ['id' => $id]) : null,
+                'pulseUrl' => config('feature.content-locking') ? route('lock.pulse', ['id' => $id]) : null,
             ]
         );
 

diff --git a/sourcecode/apis/contentauthor/app/Http/Controllers/H5PController.php b/sourcecode/apis/contentauthor/app/Http/Controllers/H5PController.php
@@ -288,7 +288,7 @@ public function edit(Request $request, int $id): View
             'autoTranslateTo' => $adapter->autoTranslateTo(),
             'useLicense' => config('feature.licensing') === true || config('feature.licensing') === '1',
             'h5pLanguage' => $h5pLanguage,
-            'pulseUrl' => config('feature.content-locking') ? route('lock.status', ['id' => $id]) : null,
+            'pulseUrl' => config('feature.content-locking') ? route('lock.pulse', ['id' => $id]) : null,
             'editorLanguage' => Session::get('locale', config('app.fallback_locale')),
         ]);
 

diff --git a/sourcecode/apis/contentauthor/routes/web.php b/sourcecode/apis/contentauthor/routes/web.php
@@ -111,7 +111,7 @@
 
 
 Route::get('v1/content/{id}/lock-status', [LockStatusController::class, 'index'])->name('lock.status');
-Route::post('v1/content/{id}/lock-status', [LockStatusController::class, 'pulse'])->name('lock.status');
+Route::post('v1/content/{id}/lock-status', [LockStatusController::class, 'pulse'])->name('lock.pulse');
 Route::match(['GET', 'POST'], 'v1/content/{id}/unlock', [UnlockController::class, 'index'])->name('lock.unlock');
 
 // AJAX and REST(ish) routes