});
});
- angular.module('api4Explorer').controller('Api4Explorer', function($scope, $routeParams, $location, $timeout, $http, crmUiHelp, crmApi4) {
+ angular.module('api4Explorer').controller('Api4Explorer', function($scope, $routeParams, $location, $timeout, $http, crmUiHelp, crmApi4, dialogService) {
var ts = $scope.ts = CRM.ts();
$scope.entities = entities;
$scope.actions = actions;
$scope.fields = [];
+ $scope.havingOptions = [];
$scope.fieldsAndJoins = [];
- $scope.selectFieldsAndJoins = [];
+ $scope.fieldsAndJoinsAndFunctions = [];
+ $scope.fieldsAndJoinsAndFunctionsAndWildcards = [];
$scope.availableParams = {};
$scope.params = {};
$scope.index = '';
$scope.selectedTab = {result: 'result', code: 'php'};
$scope.perm = {
- accessDebugOutput: CRM.checkPerm('access debug output')
+ accessDebugOutput: CRM.checkPerm('access debug output'),
+ editGroups: CRM.checkPerm('edit groups')
};
marked.setOptions({highlight: prettyPrintOne});
var getMetaParams = {},
$scope.status = 'default';
$scope.loading = false;
$scope.controls = {};
- $scope.code = [
- {
- lang: 'php',
- style: [
- {name: 'oop', label: ts('OOP Style'), code: ''},
- {name: 'php', label: ts('Traditional'), code: ''}
- ]
- },
- {
- lang: 'js',
- style: [
- {name: 'js', label: ts('Single Call'), code: ''},
- {name: 'js2', label: ts('Batch Calls'), code: ''}
- ]
- },
- {
- lang: 'ang',
- style: [
- {name: 'ang', label: ts('Single Call'), code: ''},
- {name: 'ang2', label: ts('Batch Calls'), code: ''}
- ]
- },
- {
- lang: 'cli',
- style: [
- {name: 'cv', label: ts('CV'), code: ''}
- ]
- },
- ];
+ $scope.langs = ['php', 'js', 'ang', 'cli'];
+ $scope.code = {
+ php: [
+ {name: 'oop', label: ts('OOP Style'), code: ''},
+ {name: 'php', label: ts('Traditional'), code: ''}
+ ],
+ js: [
+ {name: 'js', label: ts('Single Call'), code: ''},
+ {name: 'js2', label: ts('Batch Calls'), code: ''}
+ ],
+ ang: [
+ {name: 'ang', label: ts('Single Call'), code: ''},
+ {name: 'ang2', label: ts('Batch Calls'), code: ''}
+ ],
+ cli: [
+ {name: 'cv', label: ts('CV'), code: ''}
+ ]
+ };
if (!entities.length) {
formatForSelect2(schema, entities, 'name', ['description']);
}
}
- // Turn a flat array into a select2 array
- function arrayToSelect2(array) {
- var out = [];
- _.each(array, function(item) {
- out.push({id: item, text: item});
- });
- return out;
- }
-
// Reformat an existing array of objects for compatibility with select2
function formatForSelect2(input, container, key, extra, prefix) {
_.each(input, function(item) {
$scope.helpContent = helpContent;
} else {
$scope.helpTitle = title;
- $scope.helpContent = convertMarkdown(content);
+ $scope.helpContent = formatHelp(content);
}
};
// Sets the static help text (which gets overridden by mousing over other elements)
function setHelp(title, content) {
$scope.helpTitle = helpTitle = title;
- $scope.helpContent = helpContent = convertMarkdown(content);
+ $scope.helpContent = helpContent = formatHelp(content);
}
- function convertMarkdown(rawContent) {
+ // Convert plain-text help to markdown; replace variables and format links
+ function formatHelp(rawContent) {
+ function formatRefs(see) {
+ _.each(see, function(ref, idx) {
+ var match = ref.match(/^\\Civi\\Api4\\([a-zA-Z]+)$/);
+ if (match) {
+ ref = '#/explorer/' + match[1];
+ }
+ if (ref[0] === '\\') {
+ ref = 'https://github.com/civicrm/civicrm-core/blob/master' + ref.replace(/\\/i, '/') + '.php';
+ }
+ see[idx] = '<a target="' + (ref[0] === '#' ? '_self' : '_blank') + '" href="' + ref + '">' + see[idx] + '</a>';
+ });
+ }
var formatted = _.cloneDeep(rawContent);
if (formatted.description) {
formatted.description = marked(formatted.description);
if (formatted.comment) {
formatted.comment = marked(formatted.comment);
}
+ formatRefs(formatted.see);
return formatted;
}
- // Format the href for a @see help annotation
- $scope.formatRef = function(see) {
- var match = see.match(/^\\Civi\\Api4\\([a-zA-Z]+)$/);
- if (match) {
- return '#/explorer/' + match[1];
- }
- if (see[0] === '\\') {
- return 'https://github.com/civicrm/civicrm-core/blob/master' + see.replace(/\\/i, '/') + '.php';
- }
- return see;
- };
-
$scope.fieldHelp = function(fieldName) {
var field = getField(fieldName, $scope.entity, $scope.action);
if (!field) {
(row.description ? '<div class="crm-select2-row-description"><p>' + _.escape(row.description) + '</p></div>' : '');
};
- $scope.clearParam = function(name) {
- $scope.params[name] = $scope.availableParams[name].default;
+ $scope.clearParam = function(name, idx) {
+ if (typeof idx === 'undefined') {
+ $scope.params[name] = $scope.availableParams[name].default;
+ } else {
+ $scope.params[name].splice(idx, 1);
+ }
};
$scope.isSpecial = function(name) {
- var specialParams = ['select', 'fields', 'action', 'where', 'values', 'defaults', 'orderBy', 'chain'];
+ var specialParams = ['select', 'fields', 'action', 'where', 'values', 'defaults', 'orderBy', 'chain', 'groupBy', 'having'];
+ if ($scope.availableParams.limit && $scope.availableParams.offset) {
+ specialParams.push('limit', 'offset');
+ }
return _.contains(specialParams, name);
};
};
$scope.isSelectRowCount = function() {
- return $scope.params && $scope.params.select && $scope.params.select.length === 1 && $scope.params.select[0] === 'row_count';
+ return isSelectRowCount($scope.params);
};
+ $scope.selectLang = function(lang) {
+ $scope.selectedTab.code = lang;
+ writeCode();
+ };
+
+ function isSelectRowCount(params) {
+ return params && params.select && params.select.length === 1 && params.select[0] === 'row_count';
+ }
+
function getEntity(entityName) {
return _.findWhere(schema, {name: entityName || $scope.entity});
}
function selectAction() {
$scope.action = $routeParams.api4action;
$scope.fieldsAndJoins.length = 0;
- $scope.selectFieldsAndJoins.length = 0;
+ $scope.fieldsAndJoinsAndFunctions.length = 0;
+ $scope.fieldsAndJoinsAndFunctionsAndWildcards.length = 0;
if (!actions.length) {
formatForSelect2(getEntity().actions, actions, 'name', ['description', 'params']);
}
$scope.fields = getFieldList($scope.action);
if (_.contains(['get', 'update', 'delete', 'replace'], $scope.action)) {
$scope.fieldsAndJoins = addJoins($scope.fields);
- $scope.selectFieldsAndJoins = addJoins($scope.fields, true);
+ var fieldsAndFunctions = _.cloneDeep($scope.fields);
+ // SQL functions are supported if HAVING is
+ if (actionInfo.params.having) {
+ fieldsAndFunctions.push({
+ text: ts('FUNCTION'),
+ description: ts('Calculate result of a SQL function'),
+ children: _.transform(CRM.vars.api4.functions, function(result, fn) {
+ result.push({
+ id: fn.name + '() AS ' + fn.name.toLowerCase(),
+ text: fn.name + '()',
+ description: fn.name + '(' + describeSqlFn(fn.params) + ')'
+ });
+ })
+ });
+ }
+ $scope.fieldsAndJoinsAndFunctions = addJoins(fieldsAndFunctions, true);
+ $scope.fieldsAndJoinsAndFunctionsAndWildcards = addJoins(fieldsAndFunctions, true);
} else {
$scope.fieldsAndJoins = $scope.fields;
- $scope.selectFieldsAndJoins = _.cloneDeep($scope.fields);
+ $scope.fieldsAndJoinsAndFunctions = $scope.fields;
+ $scope.fieldsAndJoinsAndFunctionsAndWildcards = _.cloneDeep($scope.fields);
}
- $scope.selectFieldsAndJoins.unshift({id: '*', text: '*', 'description': 'All core ' + $scope.entity + ' fields'});
+ $scope.fieldsAndJoinsAndFunctionsAndWildcards.unshift({id: '*', text: '*', 'description': 'All core ' + $scope.entity + ' fields'});
_.each(actionInfo.params, function (param, name) {
var format,
defaultVal = _.cloneDeep(param.default);
deep: format === 'json'
});
}
- if (typeof objectParams[name] !== 'undefined') {
- $scope.$watch('params.' + name, function(values) {
+ if (typeof objectParams[name] !== 'undefined' && name !== 'orderBy') {
+ $scope.$watch('params.' + name, function (values) {
// Remove empty values
- _.each(values, function(clause, index) {
+ _.each(values, function (clause, index) {
if (!clause || !clause[0]) {
- $scope.params[name].splice(index, 1);
+ $scope.clearParam(name, index);
}
});
}, true);
+ }
+ if (name === 'select' && actionInfo.params.having) {
+ $scope.$watchCollection('params.select', function(values) {
+ $scope.havingOptions.length = 0;
+ _.each(values, function(item) {
+ var pieces = item.split(' AS '),
+ alias = _.trim(pieces[pieces.length - 1]);
+ $scope.havingOptions.push({id: alias, text: alias});
+ });
+ });
+ }
+ if (typeof objectParams[name] !== 'undefined' || name === 'groupBy' || name === 'select') {
$scope.$watch('controls.' + name, function(value) {
var field = value;
$timeout(function() {
if (field) {
- var defaultOp = _.cloneDeep(objectParams[name]);
- if (name === 'chain') {
- var num = $scope.params.chain.length;
- defaultOp[0] = field;
- field = 'name_me_' + num;
+ if (typeof objectParams[name] === 'undefined') {
+ $scope.params[name].push(field);
+ } else {
+ var defaultOp = _.cloneDeep(objectParams[name]);
+ if (name === 'chain') {
+ var num = $scope.params.chain.length;
+ defaultOp[0] = field;
+ field = 'name_me_' + num;
+ }
+ $scope.params[name].push([field, defaultOp]);
}
- $scope.params[name].push([field, defaultOp]);
$scope.controls[name] = null;
}
});
writeCode();
}
+ function describeSqlFn(params) {
+ var desc = ' ';
+ _.each(params, function(param) {
+ desc += ' ';
+ if (param.prefix) {
+ desc += _.filter(param.prefix).join('|') + ' ';
+ }
+ if (param.expr === 1) {
+ desc += 'expr ';
+ } else if (param.expr > 1) {
+ desc += 'expr, ... ';
+ }
+ if (param.suffix) {
+ desc += ' ' + _.filter(param.suffix).join('|') + ' ';
+ }
+ });
+ return desc.replace(/[ ]+/g, ' ');
+ }
+
function defaultValues(defaultVal) {
_.each($scope.fields, function(field) {
if (field.required) {
}
var results = lcfirst(_.isNumber(index) ? result : pluralize(result)),
paramCount = _.size(params),
- isSelectRowCount = params.select && params.select.length === 1 && params.select[0] === 'row_count',
i = 0;
- if (isSelectRowCount) {
+ if (isSelectRowCount(params)) {
results = result + 'Count';
}
- // Write javascript
- var js = "'" + entity + "', '" + action + "', {";
- _.each(params, function(param, key) {
- js += "\n " + key + ': ' + stringify(param) +
- (++i < paramCount ? ',' : '');
- if (key === 'checkPermissions') {
- js += ' // IGNORED: permissions are always enforced from client-side requests';
- }
- });
- js += "\n}";
- if (index || index === 0) {
- js += ', ' + JSON.stringify(index);
- }
- code.js = "CRM.api4(" + js + ").then(function(" + results + ") {\n // do something with " + results + " array\n}, function(failure) {\n // handle failure\n});";
- code.js2 = "CRM.api4({" + results + ': [' + js + "]}).then(function(batch) {\n // do something with batch." + results + " array\n}, function(failure) {\n // handle failure\n});";
- code.ang = "crmApi4(" + js + ").then(function(" + results + ") {\n // do something with " + results + " array\n}, function(failure) {\n // handle failure\n});";
- code.ang2 = "crmApi4({" + results + ': [' + js + "]}).then(function(batch) {\n // do something with batch." + results + " array\n}, function(failure) {\n // handle failure\n});";
-
- // Write php code
- code.php = '$' + results + " = civicrm_api4('" + entity + "', '" + action + "', [";
- _.each(params, function(param, key) {
- code.php += "\n '" + key + "' => " + phpFormat(param, 4) + ',';
- });
- code.php += "\n]";
- if (index || index === 0) {
- code.php += ', ' + phpFormat(index);
- }
- code.php += ");";
-
- // Write oop code
- if (entity.substr(0, 7) !== 'Custom_') {
- code.oop = '$' + results + " = \\Civi\\Api4\\" + entity + '::' + action + '()';
- } else {
- code.oop = '$' + results + " = \\Civi\\Api4\\CustomValue::" + action + "('" + entity.substr(7) + "')";
- }
- _.each(params, function(param, key) {
- var val = '';
- if (typeof objectParams[key] !== 'undefined' && key !== 'chain') {
- _.each(param, function(item, index) {
- val = phpFormat(index) + ', ' + phpFormat(item, 4);
- code.oop += "\n ->add" + ucfirst(key).replace(/s$/, '') + '(' + val + ')';
- });
- } else if (key === 'where') {
- _.each(param, function (clause) {
- if (clause[0] === 'AND' || clause[0] === 'OR' || clause[0] === 'NOT') {
- code.oop += "\n ->addClause(" + phpFormat(clause[0]) + ", " + phpFormat(clause[1]).slice(1, -1) + ')';
- } else {
- code.oop += "\n ->addWhere(" + phpFormat(clause).slice(1, -1) + ")";
+ switch ($scope.selectedTab.code) {
+ case 'js':
+ case 'ang':
+ // Write javascript
+ var js = "'" + entity + "', '" + action + "', {";
+ _.each(params, function(param, key) {
+ js += "\n " + key + ': ' + stringify(param) +
+ (++i < paramCount ? ',' : '');
+ if (key === 'checkPermissions') {
+ js += ' // IGNORED: permissions are always enforced from client-side requests';
}
});
- } else if (key === 'select') {
- code.oop += "\n ";
- // addSelect() is a variadic function & can take multiple arguments; selectRowCount() is a shortcut for addSelect('row_count')
- code.oop += isSelectRowCount ? '->selectRowCount()' : '->addSelect(' + phpFormat(param).slice(1, -1) + ')';
- } else {
- code.oop += "\n ->set" + ucfirst(key) + '(' + phpFormat(param, 4) + ')';
- }
- });
- code.oop += "\n ->execute()";
- if (isSelectRowCount) {
- code.oop += "\n ->count()";
- } else if (_.isNumber(index)) {
- code.oop += !index ? '\n ->first()' : (index === -1 ? '\n ->last()' : '\n ->itemAt(' + index + ')');
- } else if (index) {
- if (_.isString(index) || (_.isPlainObject(index) && !index[0] && !index['0'])) {
- code.oop += "\n ->indexBy('" + (_.isPlainObject(index) ? _.keys(index)[0] : index) + "')";
- }
- if (_.isArray(index) || _.isPlainObject(index)) {
- code.oop += "\n ->column('" + (_.isArray(index) ? index[0] : _.values(index)[0]) + "')";
- }
- }
- code.oop += ";\n";
- if (!_.isNumber(index) && !isSelectRowCount) {
- code.oop += "foreach ($" + results + ' as $' + ((_.isString(index) && index) ? index + ' => $' : '') + result + ') {\n // do something\n}';
- }
+ js += "\n}";
+ if (index || index === 0) {
+ js += ', ' + JSON.stringify(index);
+ }
+ code.js = "CRM.api4(" + js + ").then(function(" + results + ") {\n // do something with " + results + " array\n}, function(failure) {\n // handle failure\n});";
+ code.js2 = "CRM.api4({" + results + ': [' + js + "]}).then(function(batch) {\n // do something with batch." + results + " array\n}, function(failure) {\n // handle failure\n});";
+ code.ang = "crmApi4(" + js + ").then(function(" + results + ") {\n // do something with " + results + " array\n}, function(failure) {\n // handle failure\n});";
+ code.ang2 = "crmApi4({" + results + ': [' + js + "]}).then(function(batch) {\n // do something with batch." + results + " array\n}, function(failure) {\n // handle failure\n});";
+ break;
+
+ case 'php':
+ // Write php code
+ code.php = '$' + results + " = civicrm_api4('" + entity + "', '" + action + "', [";
+ _.each(params, function(param, key) {
+ code.php += "\n '" + key + "' => " + phpFormat(param, 4) + ',';
+ });
+ code.php += "\n]";
+ if (index || index === 0) {
+ code.php += ', ' + phpFormat(index);
+ }
+ code.php += ");";
+
+ // Write oop code
+ code.oop = '$' + results + " = " + formatOOP(entity, action, params, 2) + "\n ->execute()";
+ if (isSelectRowCount(params)) {
+ code.oop += "\n ->count()";
+ } else if (_.isNumber(index)) {
+ code.oop += !index ? '\n ->first()' : (index === -1 ? '\n ->last()' : '\n ->itemAt(' + index + ')');
+ } else if (index) {
+ if (_.isString(index) || (_.isPlainObject(index) && !index[0] && !index['0'])) {
+ code.oop += "\n ->indexBy('" + (_.isPlainObject(index) ? _.keys(index)[0] : index) + "')";
+ }
+ if (_.isArray(index) || _.isPlainObject(index)) {
+ code.oop += "\n ->column('" + (_.isArray(index) ? index[0] : _.values(index)[0]) + "')";
+ }
+ }
+ code.oop += ";\n";
+ if (!_.isNumber(index) && !isSelectRowCount(params)) {
+ code.oop += "foreach ($" + results + ' as $' + ((_.isString(index) && index) ? index + ' => $' : '') + result + ') {\n // do something\n}';
+ }
+ break;
- // Write cli code
- code.cv = 'cv api4 ' + entity + '.' + action + " '" + stringify(params) + "'";
+ case 'cli':
+ // Write cli code
+ code.cv = 'cv api4 ' + entity + '.' + action + " '" + stringify(params) + "'";
+ }
}
_.each($scope.code, function(vals) {
- _.each(vals.style, function(style) {
+ _.each(vals, function(style) {
style.code = code[style.name] ? prettyPrintOne(code[style.name]) : '';
});
});
}
+ // Format oop params
+ function formatOOP(entity, action, params, indent) {
+ var code = '',
+ newLine = "\n" + _.repeat(' ', indent);
+ if (entity.substr(0, 7) !== 'Custom_') {
+ code = "\\Civi\\Api4\\" + entity + '::' + action + '()';
+ } else {
+ code = "\\Civi\\Api4\\CustomValue::" + action + "('" + entity.substr(7) + "')";
+ }
+ _.each(params, function(param, key) {
+ var val = '';
+ if (typeof objectParams[key] !== 'undefined' && key !== 'chain') {
+ _.each(param, function(item, index) {
+ val = phpFormat(index) + ', ' + phpFormat(item, 2 + indent);
+ code += newLine + "->add" + ucfirst(key).replace(/s$/, '') + '(' + val + ')';
+ });
+ } else if (key === 'where') {
+ _.each(param, function (clause) {
+ if (clause[0] === 'AND' || clause[0] === 'OR' || clause[0] === 'NOT') {
+ code += newLine + "->addClause(" + phpFormat(clause[0]) + ", " + phpFormat(clause[1]).slice(1, -1) + ')';
+ } else {
+ code += newLine + "->addWhere(" + phpFormat(clause).slice(1, -1) + ")";
+ }
+ });
+ } else if (key === 'select') {
+ code += newLine;
+ // addSelect() is a variadic function & can take multiple arguments; selectRowCount() is a shortcut for addSelect('row_count')
+ code += isSelectRowCount(params) ? '->selectRowCount()' : '->addSelect(' + phpFormat(param).slice(1, -1) + ')';
+ } else if (key === 'chain') {
+ _.each(param, function(chain, name) {
+ code += newLine + "->addChain('" + name + "', " + formatOOP(chain[0], chain[1], chain[2], 2 + indent);
+ code += (chain.length > 3 ? ',' : '') + (!_.isEmpty(chain[2]) ? newLine : ' ') + (chain.length > 3 ? phpFormat(chain[3]) : '') + ')';
+ });
+ }
+ else {
+ code += newLine + "->set" + ucfirst(key) + '(' + phpFormat(param, 2 + indent) + ')';
+ }
+ });
+ return code;
+ }
+
function isInt(value) {
if (_.isFinite(value)) {
return true;
return docs.params[name];
};
+ $scope.executeDoc = function() {
+ var doc = {
+ description: ts('Runs API call on the CiviCRM database.'),
+ comment: ts('Results and debugging info will be displayed below.')
+ };
+ if ($scope.action === 'delete') {
+ doc.WARNING = ts('This API call will be executed on the real database. Deleting data cannot be undone.');
+ }
+ else if ($scope.action && $scope.action.slice(0, 3) !== 'get') {
+ doc.WARNING = ts('This API call will be executed on the real database. It cannot be undone.');
+ }
+ return doc;
+ };
+
+ $scope.saveDoc = function() {
+ return {
+ description: ts('Save API call as a smart group.'),
+ comment: ts('Allows you to create a SavedSearch containing the WHERE clause of this API call.'),
+ };
+ };
+
$scope.$watch('params', writeCode, true);
$scope.$watch('index', writeCode);
writeCode();
+ $scope.save = function() {
+ var model = {
+ title: '',
+ description: '',
+ visibility: 'User and User Admin Only',
+ group_type: [],
+ id: null,
+ entity: $scope.entity,
+ params: JSON.parse(angular.toJson($scope.params))
+ };
+ model.params.version = 4;
+ delete model.params.select;
+ delete model.params.chain;
+ delete model.params.debug;
+ delete model.params.limit;
+ delete model.params.checkPermissions;
+ var options = CRM.utils.adjustDialogDefaults({
+ width: '500px',
+ autoOpen: false,
+ title: ts('Save smart group')
+ });
+ dialogService.open('saveSearchDialog', '~/api4Explorer/SaveSearch.html', model, options);
+ };
+ });
+
+ angular.module('api4Explorer').controller('SaveSearchCtrl', function($scope, crmApi4, dialogService) {
+ var ts = $scope.ts = CRM.ts(),
+ model = $scope.model;
+ $scope.groupEntityRefParams = {
+ entity: 'Group',
+ api: {
+ params: {is_hidden: 0, is_active: 1, 'saved_search_id.api_entity': model.entity},
+ extra: ['saved_search_id', 'description', 'visibility', 'group_type']
+ },
+ select: {
+ allowClear: true,
+ minimumInputLength: 0,
+ placeholder: ts('Select existing group')
+ }
+ };
+ if (!CRM.checkPerm('administer reserved groups')) {
+ $scope.groupEntityRefParams.api.params.is_reserved = 0;
+ }
+ $scope.perm = {
+ administerReservedGroups: CRM.checkPerm('administer reserved groups')
+ };
+ $scope.options = CRM.vars.api4.groupOptions;
+ $scope.$watch('model.id', function(id) {
+ if (id) {
+ _.assign(model, $('#api-save-search-select-group').select2('data').extra);
+ }
+ });
+ $scope.cancel = function() {
+ dialogService.cancel('saveSearchDialog');
+ };
+ $scope.save = function() {
+ $('.ui-dialog:visible').block();
+ var group = model.id ? {id: model.id} : {title: model.title};
+ group.description = model.description;
+ group.visibility = model.visibility;
+ group.group_type = model.group_type;
+ group.saved_search_id = '$id';
+ var savedSearch = {
+ api_entity: model.entity,
+ api_params: model.params
+ };
+ if (group.id) {
+ savedSearch.id = model.saved_search_id;
+ }
+ crmApi4('SavedSearch', 'save', {records: [savedSearch], chain: {group: ['Group', 'save', {'records': [group]}]}})
+ .then(function(result) {
+ dialogService.close('saveSearchDialog', result[0]);
+ });
+ };
});
- angular.module('api4Explorer').directive('crmApi4WhereClause', function($timeout) {
+ angular.module('api4Explorer').directive('crmApi4Clause', function($timeout) {
return {
scope: {
- data: '=crmApi4WhereClause'
+ data: '=crmApi4Clause'
},
- templateUrl: '~/api4Explorer/WhereClause.html',
+ templateUrl: '~/api4Explorer/Clause.html',
link: function (scope, element, attrs) {
var ts = scope.ts = CRM.ts();
scope.newClause = '';
scope.operators = CRM.vars.api4.operators;
scope.addGroup = function(op) {
- scope.data.where.push([op, []]);
+ scope.data.clauses.push([op, []]);
};
scope.removeGroup = function() {
};
scope.onSort = function(event, ui) {
- $('.api4-where-fieldset').toggleClass('api4-sorting', event.type === 'sortstart');
+ $(element).closest('.api4-clause-fieldset').toggleClass('api4-sorting', event.type === 'sortstart');
$('.api4-input.form-inline').css('margin-left', '');
};
var field = value;
$timeout(function() {
if (field) {
- scope.data.where.push([field, '=', '']);
+ scope.data.clauses.push([field, '=', '']);
scope.newClause = null;
}
});
});
- scope.$watch('data.where', function(values) {
+ scope.$watch('data.clauses', function(values) {
// Remove empty values
_.each(values, function(clause, index) {
if (typeof clause !== 'undefined' && !clause[0]) {
projects / civicrm-core.git / blobdiff