diff --git a/refstack-ui/app/components/capabilities/partials/capabilityDetailsV1.3.html b/refstack-ui/app/components/capabilities/partials/capabilityDetailsV1.3.html index 07d1ec17..db44813a 100644 --- a/refstack-ui/app/components/capabilities/partials/capabilityDetailsV1.3.html +++ b/refstack-ui/app/components/capabilities/partials/capabilityDetailsV1.3.html @@ -20,7 +20,7 @@ variable 'capabilities'. Tests ({{getObjectLength(capability.tests)}}) diff --git a/refstack-ui/app/components/results-report/resultsReportController.js b/refstack-ui/app/components/results-report/resultsReportController.js index b12b4a3d..d2588ba2 100644 --- a/refstack-ui/app/components/results-report/resultsReportController.js +++ b/refstack-ui/app/components/results-report/resultsReportController.js @@ -270,13 +270,13 @@ refstackApp.controller('resultsReportController', // it to the passedTests array. if ($scope.resultsData.results.indexOf(testId) > -1) { cap.passedTests.push(testId); - if ('flag' in details) { + if ('flagged' in details) { cap.passedFlagged.push(testId); } } else { cap.notPassedTests.push(testId); - if ('flag' in details) { + if ('flagged' in details) { cap.notPassedFlagged.push(testId); } } @@ -366,7 +366,7 @@ refstackApp.controller('resultsReportController', return ((($scope.schemaVersion === '1.2') && (capObj.flagged.indexOf(test) > -1)) || (($scope.schemaVersion === '1.3') && - (capObj.tests[test].flag))); + (capObj.tests[test].flagged))); }; /** @@ -387,7 +387,7 @@ refstackApp.controller('resultsReportController', else if (($scope.schemaVersion === '1.3') && ($scope.isTestFlagged(test, capObj))){ - return capObj.tests[test].flag.reason; + return capObj.tests[test].flagged.reason; } else { return ''; diff --git a/refstack-ui/tests/unit/ControllerSpec.js b/refstack-ui/tests/unit/ControllerSpec.js index eee48118..60c88800 100644 --- a/refstack-ui/tests/unit/ControllerSpec.js +++ b/refstack-ui/tests/unit/ControllerSpec.js @@ -329,7 +329,7 @@ describe('Refstack controllers', function () { 'cap_id_1': { 'tests': { 'test_id_1': { - 'flag': { + 'flagged': { 'action': 'foo', 'date': '2015-03-24', 'reason': 'bar' @@ -380,7 +380,7 @@ describe('Refstack controllers', function () { capObj = {'tests': { 'test1': { - 'flag': { + 'flagged': { 'action': 'foo', 'date': '2015-03-24', 'reason': 'bar' @@ -414,7 +414,7 @@ describe('Refstack controllers', function () { capObj = {'tests': { 'test1': { - 'flag': { + 'flagged': { 'action': 'foo', 'date': '2015-03-24', 'reason': 'bar'