diff --git a/apps/maarch_entreprise/js/angular/app/administration/docservers-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/docservers-administration.component.ts index 87952f44ab6f68a76cfec0e202c363a68a5fe92f..e3ce1ba843f79be4e260095a54e64bbf94990f2f 100644 --- a/apps/maarch_entreprise/js/angular/app/administration/docservers-administration.component.ts +++ b/apps/maarch_entreprise/js/angular/app/administration/docservers-administration.component.ts @@ -70,7 +70,7 @@ export class DocserversAdministrationComponent implements OnInit { if (JSON.stringify(docserver) === JSON.stringify(docserversClone)) { return true } else { - if (docserver.size_limit_number >= docserver.actual_size_number && docserver.limitSizeFormatted > 0 && /^[\d]*$/.test(docserver.limitSizeFormatted) && /\/$/.test(docserver.path_template) ) { + if (docserver.size_limit_number >= docserver.actual_size_number && docserver.limitSizeFormatted > 0 && /^[\d]*$/.test(docserver.limitSizeFormatted) ) { return false; } else { return true; diff --git a/src/app/docserver/controllers/DocserverController.php b/src/app/docserver/controllers/DocserverController.php index 0e694985899661f814f23939f9f7b55641bc8424..085757421d3f5a39d62fda2384c4ab732520721f 100644 --- a/src/app/docserver/controllers/DocserverController.php +++ b/src/app/docserver/controllers/DocserverController.php @@ -50,7 +50,7 @@ class DocserverController } $docserver = DocserverModel::getById(['id' => $aArgs['id']]); - if(empty($docserver)){ + if (empty($docserver)) { return $response->withStatus(400)->withJson(['errors' => 'Docserver not found']); } @@ -93,7 +93,10 @@ class DocserverController 'collId' => $data['coll_id'] ]); $data['is_readonly'] = empty($existingCurrentDocserver) ? 'N' : 'Y'; - + + if (substr($data['path_template'], -1) != DIRECTORY_SEPARATOR) { + $data['path_template'] .= "/"; + } $id = DocserverModel::create($data); HistoryController::add([ @@ -142,6 +145,10 @@ class DocserverController } } + if (substr($data['path_template'], -1) != DIRECTORY_SEPARATOR) { + $data['path_template'] .= "/"; + } + $updateData = [ 'id' => $aArgs['id'], 'device_label' => $data['device_label'], @@ -172,7 +179,7 @@ class DocserverController } $docserver = DocserverModel::getById(['id' => $aArgs['id']]); - if(empty($docserver)){ + if (empty($docserver)) { return $response->withStatus(400)->withJson(['errors' => 'Docserver does not exist']); }