External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-14 04:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

[system_tracking] Display entire keypath for nested facts

Browse Source
This commit is contained in:
Joe Fiorini
2015-06-10 12:55:13 -04:00
parent cca0b08f68
commit 7374ebd7d9
2 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,8 +77,8 @@ export function formatFacts(diffedResults) {
if (isNestedFactArray(obj)) { if (isNestedFactArray(obj)) {
// factArrayIndex = obj.keyPath.length > 1 ? Number(_.last(obj.keyPath)) : obj.keyName; // factArrayIndex = obj.keyPath.length > 1 ? Number(_.last(obj.keyPath)) : obj.keyName;
displayKeyPath = _.initial(obj.keyPath).join('.'); displayKeyPath = _.initial(obj.keyPath).join('.');
} else if (keyPathStr !== rootKey) { // } else {
displayKeyPath = _.difference(obj.keyPath, rootKeyPath).join('.'); // displayKeyPath = _.difference(obj.keyPath, rootKeyPath).join('.');
} else { } else {
displayKeyPath = rootKeyPath.join('.'); displayKeyPath = rootKeyPath.join('.');
} }

13
awx/ui/static/js/system-tracking/system-tracking.partial.html
View File

@@ -67,19 +67,10 @@
<div class="FactDataTable-factGroup FactDataGroup" ng-repeat="group in factData | orderBy: 'displayKeyPath'"> <div class="FactDataTable-factGroup FactDataGroup" ng-repeat="group in factData | orderBy: 'displayKeyPath'">
<div class="FactDataTable-groupHeadingRow" ng-switch="group.nestingLevel" ng-if="group.displayKeyPath"> <div class="FactDataTable-groupHeadingRow" ng-if="group.displayKeyPath">
<h2 class="FactDataTable-column FactDataTable-column--full FactDataGroup-header" ng-switch-when="0"> <h2 class="FactDataTable-column FactDataTable-column--full FactDataGroup-header">
{{group.displayKeyPath}} {{group.displayKeyPath}}
</h2> </h2>
<h3 class="FactDataTable-column FactDataTable-column--full" ng-switch-when="1">
{{group.displayKeyPath}}
</h3>
<h4 class="FactDataTable-column FactDataTable-column--full" ng-switch-when="2">
{{group.displayKeyPath}}
</h4>
<h5 class="FactDataTable-column FactDataTable-column--full" ng-switch-when="3">
{{group.displayKeyPath}}
</h5>
</div> </div>
<div class="FactDataGroup-facts" data-facts="{{group.facts}}"> <div class="FactDataGroup-facts" data-facts="{{group.facts}}">
<div class="FactDataTable-arrayGroup" ng-if="group.isFactArray" ng-repeat="arrayGroup in group.facts" data-array-group="{{arrayGroup}}"> <div class="FactDataTable-arrayGroup" ng-if="group.isFactArray" ng-repeat="arrayGroup in group.facts" data-array-group="{{arrayGroup}}">