External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 13:36:02 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix issue with host columns getting flipped

Browse Source
This commit is contained in:
Joe Fiorini
2015-06-05 16:44:55 -04:00
parent dae25b7123
commit d2c7d7331d
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/system-tracking/compare-facts/flat.js
View File

@@ -41,13 +41,13 @@ export default
function flatCompare(basisFacts, comparatorFacts, nameKey, compareKeys, factTemplate) { function flatCompare(basisFacts, comparatorFacts, nameKey, compareKeys, factTemplate) {
return basisFacts.reduce(function(arr, basisFact) { return basisFacts.facts.reduce(function(arr, basisFact) {
var searcher = {}; var searcher = {};
searcher[nameKey] = basisFact[nameKey]; searcher[nameKey] = basisFact[nameKey];
var basisTemplate, comparatorTemplate, slottedValues, basisValue, comparatorValue; var basisTemplate, comparatorTemplate, slottedValues, basisValue, comparatorValue;
var matchingFact = _.where(comparatorFacts, searcher); var matchingFact = _.where(comparatorFacts.facts, searcher);
var diffs; var diffs;
if (_.isEmpty(matchingFact)) { if (_.isEmpty(matchingFact)) {

16
awx/ui/static/js/system-tracking/system-tracking.controller.js
View File

@@ -83,10 +83,15 @@ function controller($rootScope,
// Save the position of the data so we // Save the position of the data so we
// don't lose it later // don't lose it later
facts[0].position = 'left'; var wrappedFacts =
facts[1].position = 'right'; facts.map(function(facts, index) {
return { position: index === 0 ? 'left' : 'right',
isEmpty: _.isEmpty(facts),
facts: facts
};
});
var splitFacts = _.partition(facts, _.isEmpty); var splitFacts = _.partition(facts, 'isEmpty');
var emptyScans = splitFacts[0]; var emptyScans = splitFacts[0];
var nonEmptyScans = splitFacts[1]; var nonEmptyScans = splitFacts[1];
var result; var result;
@@ -109,12 +114,9 @@ function controller($rootScope,
dateValue: emptyScans[0].position === 'left' ? $scope.leftDate.clone() : $scope.rightDate.clone() dateValue: emptyScans[0].position === 'left' ? $scope.leftDate.clone() : $scope.rightDate.clone()
}); });
} else { } else {
result = _.promise(facts); result = _.promise(wrappedFacts);
} }
delete facts[0].position;
delete facts[1].position;
// all scans have data, rejoice! // all scans have data, rejoice!
return result; return result;