Merge pull request #2052 from jlmitch5/fixInstancesList

instance list fixes
This commit is contained in:
John Mitchell
2018-06-11 10:05:21 -04:00
committed by GitHub
4 changed files with 16 additions and 2 deletions
@@ -58,7 +58,7 @@
</div>
</div>
<div class="at-Row-items">
<div class="at-Row-items at-Row-items--instances">
<at-row-item header-value="{{ instance.hostname }}"></at-row-item>
<at-row-item
label-value="{{:: vm.strings.get('list.ROW_ITEM_LABEL_RUNNING_JOBS') }}"
+7 -1
View File
@@ -251,7 +251,13 @@ function InstanceGroupsRun ($stateExtender, strings, ComponentsStrings) {
}
},
resolve: {
resolvedModels: InstanceGroupsResolve
resolvedModels: InstanceGroupsResolve,
Dataset: ['GetBasePath', 'QuerySet', '$stateParams',
function(GetBasePath, qs, $stateParams) {
let path = `${GetBasePath('instance_groups')}${$stateParams.instance_group_id}/instances`;
return qs.search(path, $stateParams[`instance_search`]);
}
]
}
});