kor-elf/my-projects-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Fixed category display error from documentation. Previously, I showed all categories of documentation.

Browse Source
This commit is contained in:
Leonid Nikitin
2024-07-26 22:11:54 +05:00
parent 22bb840705
commit a5e3c5ed25
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/application/app/Services/Admin/Project/DocumentationCategoryService.php
View File

@@ -89,7 +89,7 @@ final class DocumentationCategoryService extends Service
'version' => $version,
'project' => $project,
'category' => new DocumentationCategory(),
'categories' => $this->documentationCategoryRepository->getForSelect($defaultLanguage),
'categories' => $this->documentationCategoryRepository->getForSelect($version, $defaultLanguage),
]);
}
@@ -119,7 +119,7 @@ final class DocumentationCategoryService extends Service
'version' => $version,
'project' => $project,
'category' => $category,
'categories' => $this->documentationCategoryRepository->getForSelect($defaultLanguage, $category, $withCategories),
'categories' => $this->documentationCategoryRepository->getForSelect($version, $defaultLanguage, $category, $withCategories),
]);
}

10
app/application/app/Services/Admin/Project/DocumentationService.php
View File

@@ -5,13 +5,13 @@ namespace App\Services\Admin\Project;
use App\Dto\Builder\Documentation as DocumentationBuilderDto;
use App\Dto\QuerySettingsDto;
use App\Dto\Service\Admin\Project\Documentation\StoreUpdate;
use App\Exceptions\Services\DocumentationContent\StorageCommandException;
use App\Models\Documentation;
use App\Models\ProjectLanguage;
use App\Models\User;
use App\Repositories\DocumentationCategoryRepository;
use App\Repositories\DocumentationRepository;
use App\Repositories\DocumentationVersionRepository;
use App\Repositories\ProjectRepository;
use App\ServiceResults\ServiceResultArray;
use App\ServiceResults\ServiceResultError;
use App\ServiceResults\ServiceResultSuccess;
@@ -89,7 +89,7 @@ final class DocumentationService extends Service
'version' => $version,
'project' => $project,
'documentation' => new Documentation(),
'categories' => $this->documentationCategoryRepository->getForSelect($defaultLanguage),
'categories' => $this->documentationCategoryRepository->getForSelect($version, $defaultLanguage),
]);
}
@@ -119,7 +119,7 @@ final class DocumentationService extends Service
'version' => $version,
'project' => $project,
'documentation' => $documentation,
'categories' => $this->documentationCategoryRepository->getForSelect($defaultLanguage, null, $withCategories),
'categories' => $this->documentationCategoryRepository->getForSelect($version, $defaultLanguage, null, $withCategories),
]);
}
@@ -150,6 +150,8 @@ final class DocumentationService extends Service
return $documentation;
});
} catch (StorageCommandException $e) {
return $e->getResultError();
} catch (\Throwable $e) {
report($e);
return $this->errService(__('Server Error'));
@@ -190,6 +192,8 @@ final class DocumentationService extends Service
return $documentation;
});
} catch (StorageCommandException $e) {
return $e->getResultError();
} catch (\Throwable $e) {
report($e);
return $this->errService(__('Server Error'));