From 89a50c670e31eab764b32b3d3c8f096efa4c3d4e Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 23 Nov 2014 17:36:19 -0800 Subject: [PATCH 1/1] CRM-15578 - crmMailing2 - Fix loading of recipient-group IDs --- js/angular-crmMailing2-directives.js | 5 +++-- js/angular-crmMailing2-services.js | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js index fe6e4cbac9..d3e8089269 100644 --- a/js/angular-crmMailing2-directives.js +++ b/js/angular-crmMailing2-directives.js @@ -153,8 +153,9 @@ $(element).on("select2-removing", function (e) { var option = convertValueToObj(e.val); var typeKey = option.entity_type == 'civicrm_mailing' ? 'mailings' : 'groups'; - arrayRemove(scope.mailing[typeKey][option.mode], option.entity_id); - scope.$apply(); + scope.$parent.$apply(function(){ + arrayRemove(scope.mailing[typeKey][option.mode], option.entity_id); + }); e.preventDefault(); }); diff --git a/js/angular-crmMailing2-services.js b/js/angular-crmMailing2-services.js index f8307a75e6..8c77ef2bdd 100644 --- a/js/angular-crmMailing2-services.js +++ b/js/angular-crmMailing2-services.js @@ -28,7 +28,8 @@ mailing.mailings = {include: [], exclude: []}; _.each(groupResult.values, function(mailingGroup) { var bucket = (mailingGroup.entity_table == 'civicrm_group') ? 'groups' : 'mailings'; - mailing[bucket][mailingGroup.group_type].push(mailingGroup.entity_id); + var entityId = parseInt(mailingGroup.entity_id); + mailing[bucket][mailingGroup.group_type].push(entityId); }); return mailing; }); -- 2.25.1