Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate APIv4 into civicrm-core #15309

Merged
merged 24 commits into from
Sep 22, 2019
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f2f0f5f
Obsolete api4 extension
colemanw Sep 14, 2019
f74361a
Handle new flattened custom field return format
colemanw Sep 14, 2019
0e0f741
api4 - Port PHPUnit autoloading hacks
Sep 15, 2019
f0b90b0
api4 - Add civicrm_api4() and CRM.api4() entry-points
Sep 15, 2019
caaeea3
api4 - Enable services
Sep 15, 2019
19b53e5
api4 - Import CRM/, Civi/, templates/, ang/, css/, js/, xml/menu
Sep 15, 2019
cdeee72
api4 - Adjust to new name
Sep 15, 2019
e96f62c
api4 - Update test init
Sep 15, 2019
23c2d07
Search for entity-specific actions in core
colemanw Sep 15, 2019
bd2669e
Scan core as well as extensions for api4 entities & services
colemanw Sep 15, 2019
a2fa26f
(NFC) Pass both civilint and ReflectionUtilsTest
totten Sep 15, 2019
235e322
api4 - Fix computation of core path
totten Sep 15, 2019
c1e9641
api4 - Fix container cache/reload behavior
totten Sep 15, 2019
425c975
api4 - Search for entities in core (for realz)
totten Sep 15, 2019
2c07402
Test fixes
colemanw Sep 16, 2019
1d10c3c
Update namespace for phpunit6 compat
colemanw Sep 16, 2019
cddf293
Api4 generated code improvements
colemanw Sep 16, 2019
0b873c9
Fix api explorer module loading
colemanw Sep 16, 2019
13e9117
Add api4 menu item
colemanw Sep 17, 2019
1938279
composer.json - Add "ignore" list for js-yaml
totten Sep 18, 2019
d20bb06
distmaker - Remove steps to download api4 as extension
totten Sep 18, 2019
2e704b9
api4 - Update civicrm_generated.mysql for new nav item
totten Sep 20, 2019
6872a65
Fix number fields in api explorer
colemanw Sep 22, 2019
6f97b1d
Remove extension-specific ts()
colemanw Sep 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove extension-specific ts()
  • Loading branch information
colemanw committed Sep 22, 2019
commit 6f97b1d91fafe2f0ca4821ce0ae74304d574acf4
8 changes: 4 additions & 4 deletions ang/api4Explorer/Explorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
});

angular.module('api4Explorer').controller('Api4Explorer', function($scope, $routeParams, $location, $timeout, $http, crmUiHelp, crmApi4) {
var ts = $scope.ts = CRM.ts('api4');
var ts = $scope.ts = CRM.ts();
$scope.entities = entities;
$scope.actions = actions;
$scope.fields = [];
Expand Down Expand Up @@ -585,7 +585,7 @@
},
templateUrl: '~/api4Explorer/WhereClause.html',
link: function (scope, element, attrs) {
var ts = scope.ts = CRM.ts('api4');
var ts = scope.ts = CRM.ts();
scope.newClause = '';
scope.conjunctions = ['AND', 'OR', 'NOT'];
scope.operators = CRM.vars.api4.operators;
Expand Down Expand Up @@ -640,7 +640,7 @@
},
require: 'ngModel',
link: function (scope, element, attrs, ctrl) {
var ts = scope.ts = CRM.ts('api4'),
var ts = scope.ts = CRM.ts(),
multi = _.includes(['IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'], scope.data.op),
entity = $routeParams.api4entity,
action = $routeParams.api4action;
Expand Down Expand Up @@ -759,7 +759,7 @@
},
templateUrl: '~/api4Explorer/Chain.html',
link: function (scope, element, attrs) {
var ts = scope.ts = CRM.ts('api4');
var ts = scope.ts = CRM.ts();

function changeEntity(newEntity, oldEntity) {
// When clearing entity remove this chain
Expand Down