projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #8101 from colemanw/CRM-18379
[civicrm-core.git]
/
js
/
jquery
/
jquery.crmProfileSelector.js
diff --git
a/js/jquery/jquery.crmProfileSelector.js
b/js/jquery/jquery.crmProfileSelector.js
index b46dd499dced245a2d6c870d4d1d39d8c899b0ef..bb09f4335139770429cc6f2bc9daf0945cefc23c 100644
(file)
--- a/
js/jquery/jquery.crmProfileSelector.js
+++ b/
js/jquery/jquery.crmProfileSelector.js
@@
-29,10
+29,15
@@
$select = $(this).hide().addClass('rendered');
var validTypesId = [];
$select = $(this).hide().addClass('rendered');
var validTypesId = [];
+ var usedByFilter = null;
if (options.groupTypeFilter) {
matchingUfGroups = ufGroupCollection.subcollection({
filter: function(ufGroupModel) {
if (options.groupTypeFilter) {
matchingUfGroups = ufGroupCollection.subcollection({
filter: function(ufGroupModel) {
- return ufGroupModel.checkGroupType(options.groupTypeFilter, options.allowAllSubtypes);
+ //CRM-16915 - filter with module used by the profile
+ if (!$.isEmptyObject(options.usedByFilter)) {
+ usedByFilter = options.usedByFilter;
+ }
+ return ufGroupModel.checkGroupType(options.groupTypeFilter, options.allowAllSubtypes, usedByFilter);
}
});
} else {
}
});
} else {
@@
-85,7
+90,8
@@
groupTypeFilter: $(this).data('groupType'),
entities: $(this).data('entities'),
//CRM-15427
groupTypeFilter: $(this).data('groupType'),
entities: $(this).data('entities'),
//CRM-15427
- allowAllSubtypes: $(this).data('default')
+ allowAllSubtypes: $(this).data('default'),
+ usedByFilter: $(this).data('usedfor')
});
});
});
});
});
});