From cde0133a85baf2c8141f54b2e157b92d490279cd Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Mon, 31 May 2021 18:16:52 +0200
Subject: [PATCH] FIX #17005 TIME 0:20 login message is not mandatory
---
package.json | 20 +++++++++----------
.../controllers/ConfigurationController.php | 4 ++--
.../customization/customization.component.ts | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/package.json b/package.json
index f76d108942..5a4f13293d 100644
--- a/package.json
+++ b/package.json
@@ -43,14 +43,14 @@
"@angular/platform-browser": "^11.2.14",
"@angular/platform-browser-dynamic": "^11.2.14",
"@angular/router": "^11.2.14",
- "@biesbjerg/ngx-translate-extract": "^6.0.3",
+ "@biesbjerg/ngx-translate-extract": "^6.1.0",
"@fortawesome/fontawesome-free": "^5.15.3",
"@ionic/angular": "^5.6.7",
"@ngrx/store": "^9.2.1",
"@ngrx/store-devtools": "^9.2.1",
"@ngx-translate/core": "^12.1.2",
"@ngx-translate/http-loader": "^4.0.0",
- "@peculiar/fortify-webcomponents": "^0.16.5",
+ "@peculiar/fortify-webcomponents": "^0.16.7",
"@types/hammerjs": "^2.0.39",
"@types/jasmine": "^3.7.4",
"@types/jasminewd2": "^2.0.9",
@@ -61,23 +61,23 @@
"@typescript-eslint/parser": "^4.25.0",
"angular2-draggable": "^2.3.2",
"angular2-signaturepad": "^3.0.4",
- "codelyzer": "^5.1.2",
+ "codelyzer": "^5.2.2",
"eslint": "^7.27.0",
"eslint-config-prettier": "^8.2.0",
"eslint-plugin-import": "^2.23.3",
"exif-js": "^2.3.0",
"hammerjs": "^2.0.8",
"jquery": "^3.6.0",
- "ngx-cookie-service": "^3.0.3",
+ "ngx-cookie-service": "^3.1.3",
"ngx-drag-scroll": "^9.0.0-beta.4",
- "ngx-extended-pdf-viewer": "^5.0.1",
- "ngx-pipes": "^2.7.3",
- "npm-check-updates": "^4.1.0",
+ "ngx-extended-pdf-viewer": "^5.3.0",
+ "ngx-pipes": "^2.7.5",
+ "npm-check-updates": "^4.1.2",
"prettier": "^2.3.0",
- "rxjs": "^6.6.6",
- "stylus": "^0.54.7",
+ "rxjs": "^6.6.7",
+ "stylus": "^0.54.8",
"stylus-loader": "^3.0.2",
- "tslint": "~6.1.0",
+ "tslint": "~6.1.3",
"typescript": "4.0.5",
"typescript-tools": "^0.3.1"
},
diff --git a/src/app/configuration/controllers/ConfigurationController.php b/src/app/configuration/controllers/ConfigurationController.php
index 1103f8d7e2..8c763b81b9 100755
--- a/src/app/configuration/controllers/ConfigurationController.php
+++ b/src/app/configuration/controllers/ConfigurationController.php
@@ -369,8 +369,8 @@ class ConfigurationController
if (empty($body)) {
return $response->withStatus(400)->withJson(['errors' => 'Body is not set or empty']);
- } elseif (!Validator::stringType()->notEmpty()->validate($body['loginMessage'])) {
- return $response->withStatus(400)->withJson(['errors' => 'Body loginMessage is empty or not a string']);
+ } elseif (!Validator::stringType()->validate($body['loginMessage'])) {
+ return $response->withStatus(400)->withJson(['errors' => 'Body loginMessage is not a string']);
}
$configuration = ConfigurationModel::getByIdentifier(['identifier' => 'customization']);
diff --git a/src/frontend/app/administration/customization/customization.component.ts b/src/frontend/app/administration/customization/customization.component.ts
index a2efc2d8e3..bb68f36d06 100644
--- a/src/frontend/app/administration/customization/customization.component.ts
+++ b/src/frontend/app/administration/customization/customization.component.ts
@@ -31,14 +31,14 @@ export class CustomizationComponent implements OnInit {
) { }
async ngOnInit(){
- await this.getLginMessage();
+ await this.getLoginMessage();
}
ngOnDestroy(): void {
tinymce.remove();
}
- getLginMessage() {
+ getLoginMessage() {
return new Promise((resolve) => {
this.http.get('../rest/authenticationInformations').pipe(
tap((data: any) => {
--
GitLab