M3 Integration fixes pass 27

This commit is contained in:
Mark Gregory
2026-09-23 09:29:12 +01:00
parent c5af9eb128
commit 5c6fb470ca
3 changed files with 21 additions and 21 deletions
+6 -6
View File
@@ -5,9 +5,9 @@ use Modules\Countries\Http\Controllers\CountriesController;
use Modules\Countries\Http\Controllers\CountrySyncController;
use Modules\Countries\Http\Controllers\ReferenceDataController;
const COUNTRY_ROUTE = '/{country}';
$countryRoute = '/{country}';
Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->group(function (): void {
Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->group(function () use ($countryRoute): void {
Route::get('/', CountriesController::class)->name('index');
Route::get('/create', [CountriesController::class, 'create'])->name('create');
Route::post('/', [CountriesController::class, 'store'])->name('store');
@@ -17,8 +17,8 @@ Route::prefix('countries')->name('countries.')->middleware(['web', 'auth'])->gro
Route::get('/reference/languages', [ReferenceDataController::class, 'languages'])->name('languages.index');
Route::get('/reference/scripts', [ReferenceDataController::class, 'scripts'])->name('scripts.index');
Route::get('/reference/locodes', [ReferenceDataController::class, 'locodes'])->name('locodes.index');
Route::get(COUNTRY_ROUTE, [CountriesController::class, 'show'])->name('show');
Route::get(COUNTRY_ROUTE . '/edit', [CountriesController::class, 'edit'])->name('edit');
Route::put(COUNTRY_ROUTE, [CountriesController::class, 'update'])->name('update');
Route::delete(COUNTRY_ROUTE, [CountriesController::class, 'destroy'])->name('destroy');
Route::get($countryRoute, [CountriesController::class, 'show'])->name('show');
Route::get($countryRoute . '/edit', [CountriesController::class, 'edit'])->name('edit');
Route::put($countryRoute, [CountriesController::class, 'update'])->name('update');
Route::delete($countryRoute, [CountriesController::class, 'destroy'])->name('destroy');
});
+9 -9
View File
@@ -6,24 +6,24 @@ use Illuminate\Support\Facades\Route;
use Modules\Documentation\Http\Controllers\DocumentationCategoryController;
use Modules\Documentation\Http\Controllers\DocumentationController;
const DOCUMENT_ROUTE = '/documents/{document}';
$documentRoute = '/documents/{document}';
Route::middleware(['web', 'auth'])
->prefix('documentation')
->name('documentation.')
->group(function (): void {
->group(function () use ($documentRoute): void {
Route::get('/', [DocumentationController::class, 'index'])->name('index');
Route::get('/documents', [DocumentationController::class, 'index'])->name('documents.index');
Route::get('/documents/create', [DocumentationController::class, 'create'])->name('documents.create');
Route::post('/documents', [DocumentationController::class, 'store'])->name('documents.store');
Route::get(DOCUMENT_ROUTE, [DocumentationController::class, 'show'])->name('documents.show');
Route::get(DOCUMENT_ROUTE . '/edit', [DocumentationController::class, 'edit'])->name('documents.edit');
Route::put(DOCUMENT_ROUTE, [DocumentationController::class, 'update'])->name('documents.update');
Route::delete(DOCUMENT_ROUTE, [DocumentationController::class, 'destroy'])->name('documents.destroy');
Route::get(DOCUMENT_ROUTE . '/download', [DocumentationController::class, 'download'])->name('documents.download');
Route::get(DOCUMENT_ROUTE . '/attachments/{attachment}/download', [DocumentationController::class, 'downloadAttachment'])->name('documents.attachments.download');
Route::delete(DOCUMENT_ROUTE . '/attachments/{attachment}', [DocumentationController::class, 'destroyAttachment'])->name('documents.attachments.destroy');
Route::get($documentRoute, [DocumentationController::class, 'show'])->name('documents.show');
Route::get($documentRoute . '/edit', [DocumentationController::class, 'edit'])->name('documents.edit');
Route::put($documentRoute, [DocumentationController::class, 'update'])->name('documents.update');
Route::delete($documentRoute, [DocumentationController::class, 'destroy'])->name('documents.destroy');
Route::get($documentRoute . '/download', [DocumentationController::class, 'download'])->name('documents.download');
Route::get($documentRoute . '/attachments/{attachment}/download', [DocumentationController::class, 'downloadAttachment'])->name('documents.attachments.download');
Route::delete($documentRoute . '/attachments/{attachment}', [DocumentationController::class, 'destroyAttachment'])->name('documents.attachments.destroy');
Route::resource('categories', DocumentationCategoryController::class)->except(['show']);
});