Skip to content

With great power comes great responsibility FMSG-46 #resolve #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 11, 2018
Merged

With great power comes great responsibility FMSG-46 #resolve #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd03bd5
With great power comes great responsibility FMSG-46 #resolve
danielcorreia96 Jul 4, 2018
20829f7
Merge branch 'master' into fmsg_46
Luis-Cruz Jul 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions messaging-core/src/main/java/org/fenixedu/messaging/core/ui/MessagingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,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);
}

Expand Down
21 changes: 21 additions & 0 deletions messaging-core/src/main/webapp/WEB-INF/messaging/newMessage.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,16 @@ ${portal.toolkit()}
</div>
</c:if>

<div class="row">
<div id="nonOptInRequiredDiv" class="col-sm-8 col-sm-offset-2 alert alert-warning">
<h4>
<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
<spring:message code="title.disclaimer.non.optin.required.sender.selected"/>
</h4>
<p><spring:message code="disclaimer.non.optin.required.sender.selected"/></p>
</div>
</div>

<spring:eval expression="T(org.fenixedu.messaging.core.domain.Sender).available()" var="senders"/>
<spring:eval expression="T(org.fenixedu.bennu.core.util.CoreConfiguration).supportedLocales()" var="locales"/>
<form:form modelAttribute="messageBean" role="form" class="form-horizontal" action="${pageContext.request.contextPath}/messaging/message" method="post">
Expand Down Expand Up @@ -217,6 +227,7 @@ ${portal.toolkit()}
$('#replyTo').val(info.replyTo);
toggleHtml(info);
toggleAttachments(info);
toggleNonOptInRequiredDisclaimer(info);
});
}

Expand All @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions messaging-core/src/main/webapp/WEB-INF/resources/MessagingResources_pt.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,5 +104,7 @@ 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
label.sender.lastMessageSent=Última Mensagem Enviada