From bd03bd5912301a8433fc77980cba1f5706021e54 Mon Sep 17 00:00:00 2001 From: Daniel Correia Date: Wed, 4 Jul 2018 19:47:00 +0100 Subject: [PATCH] With great power comes great responsibility FMSG-46 #resolve --- .../core/ui/MessagingController.java | 1 + .../webapp/WEB-INF/messaging/newMessage.jsp | 21 +++++++++++++++++++ .../MessagingResources_en.properties | 3 +++ .../MessagingResources_pt.properties | 2 ++ 4 files changed, 27 insertions(+) diff --git a/messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java b/messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java index 49955d0..f6ef082 100644 --- a/messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java +++ b/messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java @@ -117,6 +117,7 @@ public String viewSender(final Model model, @PathVariable final Sender sender, } info.addProperty("html", sender.getHtmlEnabled()); info.addProperty("attachmentsEnabled", sender.getAttachmentsEnabled()); + info.addProperty("optInRequired", sender.getOptInRequired()); return new ResponseEntity<>(info.toString(), HttpStatus.OK); } diff --git a/messaging-core/src/main/webapp/WEB-INF/messaging/newMessage.jsp b/messaging-core/src/main/webapp/WEB-INF/messaging/newMessage.jsp index 685575a..c4f0d2c 100644 --- a/messaging-core/src/main/webapp/WEB-INF/messaging/newMessage.jsp +++ b/messaging-core/src/main/webapp/WEB-INF/messaging/newMessage.jsp @@ -41,6 +41,16 @@ ${portal.toolkit()} +
+
+

+ + +

+

+
+
+ @@ -217,6 +227,7 @@ ${portal.toolkit()} $('#replyTo').val(info.replyTo); toggleHtml(info); toggleAttachments(info); + toggleNonOptInRequiredDisclaimer(info); }); } @@ -243,6 +254,16 @@ ${portal.toolkit()} } } + function toggleNonOptInRequiredDisclaimer(info) { + var nonOptInRequiredDisclaimerEl = $('#nonOptInRequiredDiv'); + if (!info.optInRequired) { + nonOptInRequiredDisclaimerEl.show(); + } + else { + nonOptInRequiredDisclaimerEl.hide(); + } + } + var addAttachmentEl = $('#addAttachment'); addAttachmentEl.change(function(event){ var files = event.target.files; diff --git a/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties b/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties index 9d82d03..1db553a 100644 --- a/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties +++ b/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties @@ -15,6 +15,9 @@ action.view = View Details action.subscribe = Subscribe action.unsubscribe = Unsubscribe +disclaimer.non.optin.required.sender.selected = The currently selected sender is a non opt-in required sender, which means that all messages sent by this sender will reach all members of the selected recipients. +title.disclaimer.non.optin.required.sender.selected = Disclaimer - Non Opt-In Required Sender Selected + error.message.not.sent = Message could not be sent: error.template.not.saved = Message template could not be saved: error.template.undeclared = Message template is undeclared. diff --git a/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties b/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties index b1d3991..43074e6 100644 --- a/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties +++ b/messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties @@ -104,4 +104,6 @@ title.templates.config = Configuração de Modelos de Mensagem title.template = Modelo de Mensagem title.template.edit = Editar Modelo de Mensagem label.message.attachments=Anexos +disclaimer.non.optin.required.sender.selected = O remetente selecionado não requer subscrição, o que signfica que todas as mensagens enviadas por este remetente irão chegar a todos os membros dos destinatários selecionados. +title.disclaimer.non.optin.required.sender.selected = Disclaimer - Remetente Selecionado Não Requer Subscrição