From 671a5fef1f56aaab2fac972a656bf5b49bc8b86c Mon Sep 17 00:00:00 2001 From: DemeritCowboy Date: Fri, 11 Oct 2019 00:25:01 -0400 Subject: [PATCH] minor consistency change --- ang/crmCaseType.js | 8 ++++---- ang/crmCaseType/rolesTable.html | 2 +- tests/karma/unit/crmCaseTypeSpec.js | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ang/crmCaseType.js b/ang/crmCaseType.js index af7958e344..6fdc0555f1 100644 --- a/ang/crmCaseType.js +++ b/ang/crmCaseType.js @@ -357,7 +357,7 @@ _.each($scope.relationshipTypeOptions, function (relationshipTypeOption) { if (relationshipTypeOption.text == set.name) { // relationshipTypeOption.id here corresponds to one of the civicrm_relationship_type.label database fields, not civicrm_relationship_type.id - set.displaylabel = relationshipTypeOption.id; + set.displayLabel = relationshipTypeOption.id; } }); }); @@ -472,7 +472,7 @@ var matchingRoles = _.filter($scope.relationshipTypeOptions, {id: roleName}); if (matchingRoles.length) { var matchingRole = matchingRoles.shift(); - roles.push({name: roleName, displaylabel: matchingRole.text}); + roles.push({name: roleName, displayLabel: matchingRole.text}); } else { CRM.loadForm(CRM.url('civicrm/admin/reltype', {action: 'add', reset: 1, label_a_b: roleName})) .on('crmFormSuccess', function(e, data) { @@ -486,7 +486,7 @@ }; $scope.addRoleOnTheFly = function(roles, newType) { - roles.push({name: newType.label_b_a, displaylabel: newType.label_a_b}); + roles.push({name: newType.label_b_a, displayLabel: newType.label_a_b}); // Assume that the case role should be A-B but add both directions as options. $scope.relationshipTypeOptions.push({id: newType.label_a_b, text: newType.label_b_a}); if (newType.label_a_b != newType.label_b_a) { @@ -584,7 +584,7 @@ } function dropDisplaylabel (v) { - delete v.displaylabel; + delete v.displayLabel; } // strip out labels from $scope.caseType.definition.caseRoles diff --git a/ang/crmCaseType/rolesTable.html b/ang/crmCaseType/rolesTable.html index e7edee076e..11f66e1b21 100644 --- a/ang/crmCaseType/rolesTable.html +++ b/ang/crmCaseType/rolesTable.html @@ -14,7 +14,7 @@ Required vars: caseType - {{relType.displaylabel}} + {{relType.displayLabel}} diff --git a/tests/karma/unit/crmCaseTypeSpec.js b/tests/karma/unit/crmCaseTypeSpec.js index 258488ed76..81ea218683 100644 --- a/tests/karma/unit/crmCaseTypeSpec.js +++ b/tests/karma/unit/crmCaseTypeSpec.js @@ -503,11 +503,11 @@ describe('crmCaseType', function() { name: 'Homeless Services Coordinator', creator: '1', manager: '1', - displaylabel: 'Homeless Services Coordinator is' + displayLabel: 'Homeless Services Coordinator is' }, { name: 'Case Coordinator', - displaylabel: 'Case Coordinator is' + displayLabel: 'Case Coordinator is' } ] ); @@ -522,11 +522,11 @@ describe('crmCaseType', function() { name: 'Homeless Services Coordinator', creator: '1', manager: '1', - displaylabel: 'Homeless Services Coordinator is' + displayLabel: 'Homeless Services Coordinator is' }, { name: 'Homeless Services Coordinator is', - displaylabel: 'Homeless Services Coordinator' + displayLabel: 'Homeless Services Coordinator' } ] ); @@ -541,7 +541,7 @@ describe('crmCaseType', function() { name: 'Homeless Services Coordinator', creator: '1', manager: '1', - displaylabel: 'Homeless Services Coordinator is' + displayLabel: 'Homeless Services Coordinator is' } ] ); @@ -578,11 +578,11 @@ describe('crmCaseType', function() { name: 'Homeless Services Coordinator', creator: '1', manager: '1', - displaylabel: 'Homeless Services Coordinator is' + displayLabel: 'Homeless Services Coordinator is' }, { name: 'Some New Type for', - displaylabel: 'Some New Type is' + displayLabel: 'Some New Type is' } ] ); @@ -626,11 +626,11 @@ describe('crmCaseType', function() { name: 'Homeless Services Coordinator', creator: '1', manager: '1', - displaylabel: 'Homeless Services Coordinator is' + displayLabel: 'Homeless Services Coordinator is' }, { name: 'Friend of', - displaylabel: 'Friend of' + displayLabel: 'Friend of' } ] ); -- 2.25.1