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

Merge pull request #2619 from mabashian/2617

Browse Source 
Highlight group/host currently being edited
This commit is contained in:
Michael Abashian
2016-06-24 12:00:12 -04:00
committed by GitHub
parent ac1f3e142f d2dbc6a3f0
commit 1b9b14d6f7
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/client/src/inventories/manage/groups/groups-list.controller.js
View File

@@ -12,6 +12,10 @@
view = generateList, view = generateList,
pageSize = 20; pageSize = 20;
$scope.inventory_id = $stateParams.inventory_id; $scope.inventory_id = $stateParams.inventory_id;
if($state.current.name === "inventoryManage.editGroup") {
$scope.rowBeingEdited = $state.params.group_id;
$scope.listBeingEdited = "groups";
}
$scope.groupSelect = function(id){ $scope.groupSelect = function(id){
var group = $stateParams.group === undefined ? [id] : _($stateParams.group).concat(id).value(); var group = $stateParams.group === undefined ? [id] : _($stateParams.group).concat(id).value();
$state.go('inventoryManage', {inventory_id: $stateParams.inventory_id, group: group}, {reload: true}); $state.go('inventoryManage', {inventory_id: $stateParams.inventory_id, group: group}, {reload: true});
@@ -152,6 +156,22 @@
$state.go('inventoryManage.copyMoveGroup', {group_id: id, groups: $stateParams.groups}); $state.go('inventoryManage.copyMoveGroup', {group_id: id, groups: $stateParams.groups});
}; };
var cleanUpStateChangeListener = $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams) {
if (toState.name === "inventoryManage.editGroup") {
$scope.rowBeingEdited = toParams.group_id;
$scope.listBeingEdited = "groups";
}
else {
delete $scope.rowBeingEdited;
delete $scope.listBeingEdited;
}
});
// Remove the listener when the scope is destroyed to avoid a memory leak
$scope.$on('$destroy', function() {
cleanUpStateChangeListener();
});
var init = function(){ var init = function(){
list.basePath = groupsUrl; list.basePath = groupsUrl;
view.inject(list,{ view.inject(list,{

18
awx/ui/client/src/inventories/manage/hosts/hosts-list.controller.js
View File

@@ -11,6 +11,10 @@
var list = InventoryHosts, var list = InventoryHosts,
view = generateList, view = generateList,
pageSize = 20; pageSize = 20;
if($state.current.name === "inventoryManage.editHost") {
$scope.rowBeingEdited = $state.params.host_id;
$scope.listBeingEdited = "hosts";
}
$scope.createHost = function(){ $scope.createHost = function(){
$state.go('inventoryManage.addHost'); $state.go('inventoryManage.addHost');
}; };
@@ -63,6 +67,20 @@
$scope.$on('PostRefresh', ()=>{ $scope.$on('PostRefresh', ()=>{
_.forEach($scope.hosts, (host) => SetStatus({scope: $scope, host: host})); _.forEach($scope.hosts, (host) => SetStatus({scope: $scope, host: host}));
}); });
var cleanUpStateChangeListener = $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams) {
if (toState.name === "inventoryManage.editHost") {
$scope.rowBeingEdited = toParams.host_id;
$scope.listBeingEdited = "hosts";
}
else {
delete $scope.rowBeingEdited;
delete $scope.listBeingEdited;
}
});
// Remove the listener when the scope is destroyed to avoid a memory leak
$scope.$on('$destroy', function() {
cleanUpStateChangeListener();
});
var init = function(){ var init = function(){
list.basePath = hostsUrl; list.basePath = hostsUrl;
view.inject(list,{ view.inject(list,{