Skip to content

Commit dde4467

Browse files
authored
Merge pull request #95 from danielcorreia96/fmsg_46
With great power comes great responsibility FMSG-46 #resolve
2 parents 50f1fa6 + 20829f7 commit dde4467

File tree

4 files changed

+27
-0
lines changed

4 files changed

+27
-0
lines changed

messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ public String viewSender(final Model model, @PathVariable final Sender sender,
119119
}
120120
info.addProperty("html", sender.getHtmlEnabled());
121121
info.addProperty("attachmentsEnabled", sender.getAttachmentsEnabled());
122+
info.addProperty("optInRequired", sender.getOptInRequired());
122123
return new ResponseEntity<>(info.toString(), HttpStatus.OK);
123124
}
124125

messaging-core/src/main/webapp/WEB-INF/messaging/newMessage.jsp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ ${portal.toolkit()}
4141
</div>
4242
</c:if>
4343

44+
<div class="row">
45+
<div id="nonOptInRequiredDiv" class="col-sm-8 col-sm-offset-2 alert alert-warning">
46+
<h4>
47+
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
48+
<spring:message code="title.disclaimer.non.optin.required.sender.selected"/>
49+
</h4>
50+
<p><spring:message code="disclaimer.non.optin.required.sender.selected"/></p>
51+
</div>
52+
</div>
53+
4454
<spring:eval expression="T(org.fenixedu.messaging.core.domain.Sender).available()" var="senders"/>
4555
<spring:eval expression="T(org.fenixedu.bennu.core.util.CoreConfiguration).supportedLocales()" var="locales"/>
4656
<form:form modelAttribute="messageBean" role="form" class="form-horizontal" action="${pageContext.request.contextPath}/messaging/message" method="post">
@@ -217,6 +227,7 @@ ${portal.toolkit()}
217227
$('#replyTo').val(info.replyTo);
218228
toggleHtml(info);
219229
toggleAttachments(info);
230+
toggleNonOptInRequiredDisclaimer(info);
220231
});
221232
}
222233
@@ -243,6 +254,16 @@ ${portal.toolkit()}
243254
}
244255
}
245256
257+
function toggleNonOptInRequiredDisclaimer(info) {
258+
var nonOptInRequiredDisclaimerEl = $('#nonOptInRequiredDiv');
259+
if (!info.optInRequired) {
260+
nonOptInRequiredDisclaimerEl.show();
261+
}
262+
else {
263+
nonOptInRequiredDisclaimerEl.hide();
264+
}
265+
}
266+
246267
var addAttachmentEl = $('#addAttachment');
247268
addAttachmentEl.change(function(event){
248269
var files = event.target.files;

messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ action.view = View Details
1515
action.subscribe = Subscribe
1616
action.unsubscribe = Unsubscribe
1717

18+
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.
19+
title.disclaimer.non.optin.required.sender.selected = Disclaimer - Non Opt-In Required Sender Selected
20+
1821
error.message.not.sent = Message could not be sent:
1922
error.template.not.saved = Message template could not be saved:
2023
error.template.undeclared = Message template is undeclared.

messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,7 @@ title.templates.config = Configuração de Modelos de Mensagem
104104
title.template = Modelo de Mensagem
105105
title.template.edit = Editar Modelo de Mensagem
106106
label.message.attachments=Anexos
107+
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.
108+
title.disclaimer.non.optin.required.sender.selected = Disclaimer - Remetente Selecionado Não Requer Subscrição
107109
label.sender.lastMessageSent=Última Mensagem Enviada
108110

0 commit comments

Comments
 (0)