From 56566f9830caae642030a3d555dd36db8eabcb42 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 11 Jul 2019 11:52:36 +0200
Subject: [PATCH] FEAT #9305 TIME 0:25 add warn message if cant update
---
.../versions-update-administration.component.html | 4 +++-
.../versions-update-administration.component.scss | 5 +++++
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
5 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/frontend/app/administration/versionUpdate/versions-update-administration.component.html b/src/frontend/app/administration/versionUpdate/versions-update-administration.component.html
index 9c11afd92a1..245fbd6bbf2 100755
--- a/src/frontend/app/administration/versionUpdate/versions-update-administration.component.html
+++ b/src/frontend/app/administration/versionUpdate/versions-update-administration.component.html
@@ -31,8 +31,10 @@
</span>
<mat-icon class="fa fa-info-circle fa-2x" style="flex: 1;text-align: right;"></mat-icon>
</div>
+ <div class="alert-message alert-message-danger" *ngIf="!versions.canUpdate && versions.lastAvailableMinorVersion!=null" [innerHTML]="lang.updateWarn">
+ </div>
<div class="col-sm-12" style="text-align:center;" *ngIf="versions.lastAvailableMinorVersion!=null">
- <button mat-raised-button color="primary"
+ <button mat-raised-button color="primary" [disabled]="!versions.canUpdate"
(click)="updateVersionAccess();">{{lang.makeUpdate}}</button>
</div>
</mat-card>
diff --git a/src/frontend/app/administration/versionUpdate/versions-update-administration.component.scss b/src/frontend/app/administration/versionUpdate/versions-update-administration.component.scss
index 00a1d73f143..bab1b31dd20 100644
--- a/src/frontend/app/administration/versionUpdate/versions-update-administration.component.scss
+++ b/src/frontend/app/administration/versionUpdate/versions-update-administration.component.scss
@@ -9,4 +9,9 @@
background: #ffffffed;
justify-content: center;
align-items: center;
+}
+
+.alert-message-danger {
+ width: 100%;
+ max-width: 100%;
}
\ No newline at end of file
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 5707fc26275..079f135e288 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1028,6 +1028,7 @@ export const LANG_EN = {
"ok" : "Ok",
"updateOk" : "Update successfull !",
"updateInProgress" : "Update in progress ...",
+ "updateWarn" : "Some files have been <b>modified</b>, fix this problem to <b>update</b> your application.",
"updateInfo" : "This action cannot be undone! Do not make any actions during process.",
"isAvailable" : "is available",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index d554299fec4..6273dd6371e 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1061,6 +1061,7 @@ export const LANG_FR = {
"ok" : "Ok",
"updateOk" : "Mise à jour effectuée avec succès !",
"updateInProgress" : "Mise à jour en cours ...",
+ "updateWarn" : "Des fichiers de l'application ont été <b>modifiés</b>, veuillez régler ce problème afin de pouvoir procéder à la <b>mise à jour</b>.",
"updateInfo" : "Cette action est irréversible! Il est préférable de ne pas faire d\'actions durant le processus.",
"isAvailable" : "est disponible",
};
\ No newline at end of file
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index 97cbab70a7c..44e341517ae 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1054,6 +1054,7 @@ export const LANG_NL = {
"ok" : "Ok", //_TO_TRANSLATE
"updateOk" : "Update successfull !", //_TO_TRANSLATE
"updateInProgress" : "Update in progress ...", //_TO_TRANSLATE
+ "updateWarn" : "Some files have been <b>modified</b>, fix this problem to <b>update</b> your application.", //_TO_TRANSLATE
"updateInfo" : "This action cannot be undone! Do not make any actions during process.", //_TO_TRANSLATE
"isAvailable" : "is available", //_TO_TRANSLATE
};
--
GitLab