Merge branch 'fixes/fix-bijou-and-pacemaker-photo' into releases/release-hytha

This commit is contained in:
Tiavina 2025-02-12 10:16:27 +03:00
commit 216ab600c1

View File

@ -2791,10 +2791,10 @@ class PageController extends Controller {
return false; return false;
} }
$folder = FileExportHelpers::GetBijouxOfDefuntFolder($devisOfDefunt["client_nom"],$bijoux["defunt_nom"],$currentConfig->path); $folder = FileExportHelpers::GetBijouxOfDefuntFolder($devisOfDefunt["client_nom"],$bijoux["defunt_nom"],$currentConfig->path);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
try { try {
$this->storage->newFolder($folder); $this->storage->newFolder($folder);
$this->adminStorage->newFolder($folder); $this->adminStorage->newFolder($folder);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
$appAdminStorage->newFolder($folder); $appAdminStorage->newFolder($folder);
} }
catch(\OCP\Files\NotPermittedException $e) { catch(\OCP\Files\NotPermittedException $e) {
@ -2830,10 +2830,10 @@ class PageController extends Controller {
return null; return null;
} }
$folder = FileExportHelpers::GetPacemakerPhotoFolderOfDefunt($devisOfDefunt["client_nom"],$devisOfDefunt["defunt_nom"],$currentConfig->path); $folder = FileExportHelpers::GetPacemakerPhotoFolderOfDefunt($devisOfDefunt["client_nom"],$devisOfDefunt["defunt_nom"],$currentConfig->path);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
try { try {
$this->storage->newFolder($folder); $this->storage->newFolder($folder);
$this->adminStorage->newFolder($folder); $this->adminStorage->newFolder($folder);
$appAdminStorage = $this->rootFolder->getUserFolder(BddConstant::DEFAULT_ADMIN_APP_ID_NEXTCLOUD);
$appAdminStorage->newFolder($folder); $appAdminStorage->newFolder($folder);
} }
catch(\OCP\Files\NotPermittedException $e) { catch(\OCP\Files\NotPermittedException $e) {