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

Inventory refactor: Add host works. Click on a row level action on the groups list now shows the row as selected and refreshes the host list. Edit inventory properties now works. Add and Edit dialog boxes are now displayed at the last minute after all data is loaded- accomplished with new list-generator show_modal parameter.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-01-10 20:32:52 +00:00
parent 0d2417e4ae
commit 3d5a09e39e
11 changed files with 303 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui/static/js/lists/InventoryGroups.js
View File

@@ -75,12 +75,12 @@ angular.module('InventoryGroupsDefinition', [])
create: {
mode: 'all',
ngClick: "createGroup()",
ngHide: 'selected_tree_id == 1', //disable when 'All Hosts' selected
awToolTip: "Create a new group"
},
properties: {
mode: 'all',
awToolTip: "Edit inventory properties"
awToolTip: "Edit inventory properties",
ngClick: 'editInventoryProperties()'
},
refresh: {
mode: 'all',
@@ -107,7 +107,7 @@ angular.module('InventoryGroupsDefinition', [])
fieldActions: {
sync_status: {
mode: 'all',
ngClick: "viewUpdateStatus(\{\{ group.id \}\})",
ngClick: "viewUpdateStatus(\{\{ group.id + ',' + group.group_id \}\})",
ngShow: "group.id > 1", // hide for all hosts
awToolTip: "\{\{ group.status_tooltip \}\}",
ngClass: "group.status_class",
@@ -142,7 +142,7 @@ angular.module('InventoryGroupsDefinition', [])
edit: {
//label: 'Edit',
mode: 'all',
ngClick: "editGroup(\{\{ group.group_id \}\})",
ngClick: "editGroup(\{\{ group.group_id + ',' + group.id \}\})",
awToolTip: 'Edit group',
ngShow: "group.id > 1", // hide for all hosts
dataPlacement: "top"
@@ -150,7 +150,7 @@ angular.module('InventoryGroupsDefinition', [])
"delete": {
//label: 'Delete',
mode: 'all',
ngClick: "deleteGroup(\{\{ group.id \}\})",
ngClick: "deleteGroup(\{\{ group.id + ',' + group.group_id \}\})",
awToolTip: 'Delete group',
ngShow: "group.id != 1", // hide for all hosts
dataPlacement: "top"

29
awx/ui/static/js/lists/InventoryHosts.js
View File

@@ -27,19 +27,6 @@ angular.module('InventoryHostsDefinition', [])
ngClick: "editHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')",
searchPlaceholder: "search_place_holder"
},
active_failures: {
label: 'Job Status',
ngHref: "\{\{ host.activeFailuresLink \}\}",
awToolTip: "\{\{ host.badgeToolTip \}\}",
dataPlacement: 'top',
badgeNgHref: '\{\{ host.activeFailuresLink \}\}',
badgeIcon: "\{\{ 'fa icon-failures-' + host.has_active_failures \}\}",
badgePlacement: 'left',
badgeToolTip: "\{\{ host.badgeToolTip \}\}",
badgeTipPlacement: 'top',
searchable: false,
nosort: true
},
enabled_flag: {
label: 'Enabled',
badgeIcon: "\{\{ 'fa icon-enabled-' + host.enabled \}\}",
@@ -84,6 +71,20 @@ angular.module('InventoryHostsDefinition', [])
},
fieldActions: {
active_failures: {
//label: 'Job Status',
awToolTip: "\{\{ host.badgeToolTip \}\}",
dataPlacement: 'top',
badgeNgHref: '\{\{ host.activeFailuresLink \}\}',
iconClass: "\{\{ 'fa icon-failures-' + host.has_active_failures \}\}",
badgePlacement: 'left',
badgeToolTip: "\{\{ host.badgeToolTip \}\}",
badgeTipPlacement: 'top'
},
edit: {
//label: 'Edit',
ngClick: "editGroup(\{\{ host.id \}\})",
@@ -104,7 +105,7 @@ angular.module('InventoryHostsDefinition', [])
create: {
mode: 'all',
ngClick: "createHost()",
ngHide: "!selected_tree_id",
ngHide: 'selected_tree_id == 1', //disable when 'All Hosts' selected
awToolTip: "Create a new host"
},
stream: {