Added orgname to subject for mass mail

This commit is contained in:
Rick Falkvinge
2017-01-02 01:23:10 +01:00
parent 346837c7e5
commit e3b6057c3e
2 changed files with 10 additions and 2 deletions
@@ -95,7 +95,7 @@ namespace Swarmops.Logic.Communications.Payload
RenderedComm result = new RenderedComm();
result[CommRenderPart.BodyText] = body;
result[CommRenderPart.Subject] = subject;
result[CommRenderPart.Subject] = "[" + Strings[MailPayloadString.OrganizationName] + "] " + subject;
result[CommRenderPart.SenderMail] = "admin@swarmops.com"; // TODO: FIX FIX FIX HACK
result[CommRenderPart.SenderName] = "Swarmops Administrative";
+9 -1
View File
@@ -35,12 +35,20 @@
function onClickTest() {
var body = $('#<%=this.TextMessage.ClientID%>').val().trim();
if (body.length < 2) // interpreted as empty
{
alertify.alert("You should write a message body before sending your message."); // TODO: LOC
return false;
}
if (<%=this.RunningOnSandbox%> && testMessageSandboxAddress == '')
{
// Prompt for an address to send to
// This should preferably be in a mod on just Sandbox and not in code everywhere
alertify.prompt("You're currently using the Sandbox. Where would you like a test message sent?",
alertify.prompt("You're currently using the Sandbox. Where would you like a test message sent?", // TODO: LOC
function (evt, value)
{
testMessageSandboxAddress = value; // may need sanitation