From 34fbdad86b9fe5f8aaa866b703f9c42a430a355b Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Fri, 8 Jun 2018 14:33:18 +0000
Subject: [PATCH] FEAT #7731 add slash in path_template, in background
---
.../docservers-administration.component.ts | 2 +-
.../docserver/controllers/DocserverController.php | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
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 87952f44ab6..e3ce1ba843f 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 0e694985899..085757421d3 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']);
}
--
GitLab