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 #3024 from relldoesphp/CRM-14503
[civicrm-core.git]
/
js
/
model
/
crm.uf.js
diff --git
a/js/model/crm.uf.js
b/js/model/crm.uf.js
index f75cbbff8d26d3feb826e14b16999c5a7fd09639..d94bc677c7c30c95dd0916418962640d344ff9ac 100644
(file)
--- a/
js/model/crm.uf.js
+++ b/
js/model/crm.uf.js
@@
-1,5
+1,4
@@
-(function($) {
- var CRM = (window.CRM) ? (window.CRM) : (window.CRM = {});
+(function($, _) {
if (!CRM.UF) CRM.UF = {};
var YESNO = [
if (!CRM.UF) CRM.UF = {};
var YESNO = [
@@
-88,6
+87,8
@@
return 'membership_1';
case 'Participant':
return 'participant_1';
return 'membership_1';
case 'Participant':
return 'participant_1';
+ case 'Case':
+ return 'case_1';
default:
throw "Cannot guess entity name for field_type=" + field_type;
}
default:
throw "Cannot guess entity name for field_type=" + field_type;
}
@@
-687,8
+688,12
@@
// set proper entity model based on selected profile
var contactTypes = ['Individual', 'Household', 'Organization'];
// set proper entity model based on selected profile
var contactTypes = ['Individual', 'Household', 'Organization'];
- var profileType = ufGroupModel.get('group_type');
+ var profileType = ufGroupModel.get('group_type') || '';
+ if (profileType[0]) {
+ profileType = profileType[0];
+ }
profileType = profileType.split(',');
profileType = profileType.split(',');
+
var ufEntityModel;
_.each(profileType, function (ptype) {
if ($.inArray(ptype, contactTypes) > -1) {
var ufEntityModel;
_.each(profileType, function (ptype) {
if ($.inArray(ptype, contactTypes) > -1) {
@@
-776,4
+781,4
@@
CRM.UF.UFGroupCollection = CRM.Backbone.Collection.extend({
model: CRM.UF.UFGroupModel
});
CRM.UF.UFGroupCollection = CRM.Backbone.Collection.extend({
model: CRM.UF.UFGroupModel
});
-})(
cj
);
+})(
CRM.$, CRM._
);