CRM-15578 - crmMailing2 - Fix loading of recipient-group IDs

diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js
index fe6e4cbac9a54346ce067e5b6e51a856503b9ad0..d3e80892698ed374beb8bf7db21e6e36ed73cea5 100644 (file)
--- 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 f8307a75e67a3a52b7a168ac9d335731a0346d9f..8c77ef2bdd9ef1b4f5b5a4f8a30d1902c04b7d4a 100644 (file)
--- 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;
           });