From 650467ea8240e71fc5fe1b023ad135f3c090f2cf Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 29 Dec 2016 13:51:32 +0100 Subject: [PATCH] Fix for mass send categories --- Site/Pages/v5/Comms/SendMassMessage.aspx | 10 ++++++---- Site/Pages/v5/Comms/SendMassMessage.aspx.cs | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Site/Pages/v5/Comms/SendMassMessage.aspx b/Site/Pages/v5/Comms/SendMassMessage.aspx index 76346e6a..9b9ec82d 100644 --- a/Site/Pages/v5/Comms/SendMassMessage.aspx +++ b/Site/Pages/v5/Comms/SendMassMessage.aspx @@ -9,16 +9,18 @@ $(document).ready(function () { // Document.Ready() goes here - $('#<%=this.DropRecipientClasses.ClientID%>').change (function() { + $('#<%=this.DropRecipientClasses.ClientID%>').change(function() { onGeographyChange(selectedGeographyId); // does the same thing anyway - }) + }); + + updateRecipientCount(selectedReceipientClass, selectedGeographyId); }); var selectedReceipientClass = 1; var selectedGeographyId = 1; // TODO: SET ROOT GEOGRAPHY BY AUTHORITY/ACCESS function onGeographyChange(newGeographyId) { - var recipientClass = $('#<%=this.DropRecipientClasses.ClientID %>').val(); + var recipientClass = <%=this.DropRecipientClasses.ClientID %>_val(); updateRecipientCount(recipientClass, newGeographyId); selectedGeographyId = newGeographyId; @@ -65,7 +67,7 @@

-

(0)

+

(...)

diff --git a/Site/Pages/v5/Comms/SendMassMessage.aspx.cs b/Site/Pages/v5/Comms/SendMassMessage.aspx.cs index a63f32d2..a4596ba6 100644 --- a/Site/Pages/v5/Comms/SendMassMessage.aspx.cs +++ b/Site/Pages/v5/Comms/SendMassMessage.aspx.cs @@ -35,7 +35,6 @@ namespace Swarmops.Frontend.Pages.Comms this.LabelHeaderMessage.Text = Resources.Pages.Comms.SendMassMessage_HeaderMessage; this.DropRecipientClasses.Items.Clear(); - this.DropRecipientClasses.Items.Add (new ListItem (Global.Global_SelectOne, "0")); this.DropRecipientClasses.Items.Add (new ListItem (Participant.Localized(CurrentOrganization.RegularLabel, TitleVariant.Plural), "1")); this.DropRecipientClasses.Items.Add (new ListItem (Participant.Localized(CurrentOrganization.ActivistLabel, TitleVariant.Plural), "2")); // TODO: Room for dynamic membership types here