projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Jenkins Failure
[civicrm-core.git]
/
js
/
Common.js
diff --git
a/js/Common.js
b/js/Common.js
index 91faa3564322975f153e7d874ae34e155588072a..68592f040f8884007c5ab2d8a189e5f1b7329736 100644
(file)
--- a/
js/Common.js
+++ b/
js/Common.js
@@
-532,12
+532,15
@@
if (!CRM.vars) CRM.vars = {};
$('#select2-drop')
.off('.crmEntity')
.on('click.crmEntity', 'a.crm-add-entity', function(e) {
$('#select2-drop')
.off('.crmEntity')
.on('click.crmEntity', 'a.crm-add-entity', function(e) {
+ var extra = $el.data('api-params').extra,
+ formUrl = $(this).attr('href') + '&returnExtra=display_name,sort_name' + (extra ? (',' + extra) : '');
$el.select2('close');
$el.select2('close');
- CRM.loadForm(
$(this).attr('href')
, {
+ CRM.loadForm(
formUrl
, {
dialog: {width: 500, height: 220}
}).on('crmFormSuccess', function(e, data) {
if (data.status === 'success' && data.id) {
dialog: {width: 500, height: 220}
}).on('crmFormSuccess', function(e, data) {
if (data.status === 'success' && data.id) {
- CRM.status(ts('%1 Created', {1: data.label}));
+ data.label = data.extra.sort_name;
+ CRM.status(ts('%1 Created', {1: data.extra.display_name}));
if ($el.select2('container').hasClass('select2-container-multi')) {
var selection = $el.select2('data');
selection.push(data);
if ($el.select2('container').hasClass('select2-container-multi')) {
var selection = $el.select2('data');
selection.push(data);
@@
-749,7
+752,7
@@
if (!CRM.vars) CRM.vars = {};
var defaults = {
"processing": true,
"serverSide": true,
var defaults = {
"processing": true,
"serverSide": true,
- "
aaSorting
": [],
+ "
order
": [],
"dom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
"pageLength": 25,
"pagingType": "full_numbers",
"dom": '<"crm-datatable-pager-top"lfp>rt<"crm-datatable-pager-bottom"ip>',
"pageLength": 25,
"pagingType": "full_numbers",