root/THANASOFT-HFC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fixes/fix-thanato-bijou-and-pacemaker-photo-folder' into staging

Browse Source
This commit is contained in:
Tiavina 2025-02-10 10:17:35 +03:00
commit 9ce8583d85
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gestion/lib/Controller/PageController.php
View File

@ -73,6 +73,7 @@ class PageController extends Controller {
/** @var DevisPdfService */ /** @var DevisPdfService */
private $devisPdfService; private $devisPdfService;
private $rootFolder;
/** /**
* Constructor * Constructor
@ -108,6 +109,7 @@ class PageController extends Controller {
$this->defaultImagePath = $this->sharedImagePath.self::DEFAULT_NEXTCLOUD_ADMIN.'/files/.gestion/'; $this->defaultImagePath = $this->sharedImagePath.self::DEFAULT_NEXTCLOUD_ADMIN.'/files/.gestion/';
$this->talkService = $talkService; $this->talkService = $talkService;
$this->devisPdfService = $devisPdfService; $this->devisPdfService = $devisPdfService;
$this->rootFolder = $rootFolder;
//$this->fpdf = $fpdf; //$this->fpdf = $fpdf;
if ($userSession->isLoggedIn()) { if ($userSession->isLoggedIn()) {
@ -2790,8 +2792,10 @@ class PageController extends Controller {
} }
$folder = FileExportHelpers::GetBijouxOfDefuntFolder($devisOfDefunt["client_nom"],$bijoux["defunt_nom"],$currentConfig->path); $folder = FileExportHelpers::GetBijouxOfDefuntFolder($devisOfDefunt["client_nom"],$bijoux["defunt_nom"],$currentConfig->path);
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);
} }
catch(\OCP\Files\NotPermittedException $e) { catch(\OCP\Files\NotPermittedException $e) {
} }
@ -2801,6 +2805,11 @@ class PageController extends Controller {
$fileContent = file_get_contents($_FILES["photo"]["tmp_name"]); $fileContent = file_get_contents($_FILES["photo"]["tmp_name"]);
$this->storage->newFile($fullPath,$fileContent); $this->storage->newFile($fullPath,$fileContent);
$this->adminStorage->newFile($fullPath,$fileContent); $this->adminStorage->newFile($fullPath,$fileContent);
try{
$appAdminStorage->newFile($fullPath,$fileContent);
}
catch(\OCP\Files\NotPermittedException $e) {
}
$this->myDb->saveBijouxPhoto($bijouxId,$filename,$photoName); $this->myDb->saveBijouxPhoto($bijouxId,$filename,$photoName);
return $fullPath; return $fullPath;
} }
@ -2822,8 +2831,10 @@ class PageController extends Controller {
} }
$folder = FileExportHelpers::GetPacemakerPhotoFolderOfDefunt($devisOfDefunt["client_nom"],$devisOfDefunt["defunt_nom"],$currentConfig->path); $folder = FileExportHelpers::GetPacemakerPhotoFolderOfDefunt($devisOfDefunt["client_nom"],$devisOfDefunt["defunt_nom"],$currentConfig->path);
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);
} }
catch(\OCP\Files\NotPermittedException $e) { catch(\OCP\Files\NotPermittedException $e) {
} }
@ -2833,6 +2844,11 @@ class PageController extends Controller {
$fileContent = file_get_contents($_FILES["photo"]["tmp_name"]); $fileContent = file_get_contents($_FILES["photo"]["tmp_name"]);
$this->storage->newFile($fullPath,$fileContent); $this->storage->newFile($fullPath,$fileContent);
$this->adminStorage->newFile($fullPath,$fileContent); $this->adminStorage->newFile($fullPath,$fileContent);
try{
$appAdminStorage->newFile($fullPath,$fileContent);
}
catch(\OCP\Files\NotPermittedException $e) {
}
$this->myDb->saveDefuntPacemakerPhoto($defuntId,$filename,$photoName); $this->myDb->saveDefuntPacemakerPhoto($defuntId,$filename,$photoName);
return $fullPath; return $fullPath;
} }