External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

fix org list

Browse Source
This commit is contained in:
John Mitchell 2017-03-20 11:37:09 -04:00
parent bc5e275694
commit 367943fa3c
2 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
awx/ui/client/src/organizations/organizations.list.js
View File

@ -6,61 +6,59 @@
export default [function() {
return function() {
return {
name: 'organizations',
iterator: 'organization',
selectTitle: 'Add Organizations',
selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
'<i class=\"fa fa-plus\"></i> button.</p>',
editTitle: 'Organizations',
hover: true,
index: false,
return {
name: 'organizations',
iterator: 'organization',
selectTitle: 'Add Organizations',
selectInstructions: '<p>Select existing organizations by clicking each organization or checking the related checkbox. When finished, ' +
'click the blue <em>Select</em> button, located bottom right.</p><p>Create a new organization by clicking the ' +
'<i class=\"fa fa-plus\"></i> button.</p>',
editTitle: 'Organizations',
hover: true,
index: false,
fields: {
name: {
key: true,
label: 'Name',
columnClass: 'col-lg-4 col-md-6 col-sm-8 col-xs-8'
},
description: {
label: 'Description',
columnClass: 'hidden-sm hidden-xs',
excludeModal: true
}
fields: {
name: {
key: true,
label: 'Name',
columnClass: 'col-lg-4 col-md-6 col-sm-8 col-xs-8'
},
actions: {
add: {
mode: 'all', // One of: edit, select, all
ngClick: 'addOrganization()',
awToolTip: 'Create a new organization',
awFeature: 'multiple_organizations',
actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD'
}
},
fieldActions: {
edit: {
label: 'Edit',
ngClick: "editOrganization(organization.id)",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'Edit organization',
dataPlacement: 'top'
},
"delete": {
label: 'Delete',
ngClick: "deleteOrganization(organization.id, organization.name)",
icon: 'icon-trash',
"class": 'btn-xs btn-danger',
awToolTip: 'Delete organization',
dataPlacement: 'top'
}
description: {
label: 'Description',
columnClass: 'hidden-sm hidden-xs',
excludeModal: true
}
};
},
actions: {
add: {
mode: 'all', // One of: edit, select, all
ngClick: 'addOrganization()',
awToolTip: 'Create a new organization',
awFeature: 'multiple_organizations',
actionClass: 'btn List-buttonSubmit',
buttonContent: '&#43; ADD'
}
},
fieldActions: {
edit: {
label: 'Edit',
ngClick: "editOrganization(organization.id)",
icon: 'icon-edit',
"class": 'btn-xs btn-default',
awToolTip: 'Edit organization',
dataPlacement: 'top'
},
"delete": {
label: 'Delete',
ngClick: "deleteOrganization(organization.id, organization.name)",
icon: 'icon-trash',
"class": 'btn-xs btn-danger',
awToolTip: 'Delete organization',
dataPlacement: 'top'
}
}
};
}];

3
awx/ui/client/src/shared/directives.js
View File

@ -745,9 +745,6 @@ function(ConfigurationUtils, i18n, $rootScope) {
.directive('awToolTip', [function() {
return {
link: function(scope, element, attrs) {
// if (attrs.class.indexOf("JobResultsStdOut") > -1) {
// debugger;
// }
var delay = { show: 200, hide: 0 },
placement,
stateChangeWatcher;