Merge pull request #13722 from civicrm/5.11

[civicrm-core.git] / js / jquery / jquery.crmProfileSelector.js

diff --git a/js/jquery/jquery.crmProfileSelector.js b/js/jquery/jquery.crmProfileSelector.js
index 197743a1b1a826777475e1a88f5409f0a430cf71..83d1cfcf3a25249ca3c0a562512c354656e33f5f 100644 (file)
--- a/js/jquery/jquery.crmProfileSelector.js
+++ b/js/jquery/jquery.crmProfileSelector.js
@@ -34,7 +34,7 @@
         matchingUfGroups = ufGroupCollection.subcollection({
           filter: function(ufGroupModel) {
             //CRM-16915 - filter with module used by the profile
-            if (options.usedByFilter.length) {
+            if (options.usedByFilter && options.usedByFilter.length) {
               usedByFilter = options.usedByFilter;
             }
             return ufGroupModel.checkGroupType(options.groupTypeFilter, options.allowAllSubtypes, usedByFilter);
@@ -45,7 +45,7 @@
       }
 
       //CRM-15427 check for valid subtypes raise a warning if not valid
-      if (options.allowAllSubtypes && validTypesId.length === 0) {
+      if (options.allowAllSubtypes && !validTypesId.length) {
         validTypes = ufGroupCollection.subcollection({
           filter: function(ufGroupModel) {
             return ufGroupModel.checkGroupType(options.groupTypeFilter);